diff options
| author | Jim Jagielski <jim@apache.org> | 2014-04-15 19:15:02 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2014-04-15 19:15:02 +0000 |
| commit | 0dd6174440278a404eb330c9563ad5f45a1a03e0 (patch) | |
| tree | d49584a17df56ce284fdf3a28b2e75e3baa354a7 /include/ap_mmn.h | |
| parent | 91d7aa0e3134d1f7eb339f3333266081766d88d5 (diff) | |
| download | httpd-0dd6174440278a404eb330c9563ad5f45a1a03e0.tar.gz | |
Merge r1546759, r1546760 from trunk:
Add suspend_connection and resume_connection hooks to notify modules
when the thread/connection relationship changes. (Currently implemented
only for the Event MPM; should be implemented for all async MPMs.)
follow-up to r1546759: remove an inadvertently committed testcase
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1587695 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/ap_mmn.h')
| -rw-r--r-- | include/ap_mmn.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 8918e1a5f3..32e05d55b4 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -427,6 +427,7 @@ * 20120211.30 (2.4.7-dev) REWRITE_REDIRECT_HANDLER_NAME in mod_rewrite.h * 20120211.31 (2.4.7-dev) Add ap_proxy_port_of_scheme() * 20120211.32 (2.4.10-dev) Add SSL reusable SNI to mod_proxy.h's proxy_conn_rec + * 20120211.33 (2.4.10-dev) Add suspend_connection and resume_connection hooks */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -434,7 +435,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120211 #endif -#define MODULE_MAGIC_NUMBER_MINOR 32 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 33 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a |