diff options
| author | Jim Jagielski <jim@apache.org> | 2013-04-30 14:18:13 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2013-04-30 14:18:13 +0000 |
| commit | c32a7e9db208fa9ae17724a8c6bb82e61f56ab67 (patch) | |
| tree | 187250a06f7ddc43bb62c443cd87f1220b94dbc2 /include | |
| parent | 5c5fdd36ffff5b3bcc2ad58e9e574e9e8900397e (diff) | |
| download | httpd-c32a7e9db208fa9ae17724a8c6bb82e61f56ab67.tar.gz | |
Merge r1387603, r1388029, r1420124, r1421288, r1421912, r1422943, r1422980, r1430575, r1439404 from trunk:
wtf are we doing merging in these from the parent??
These are server specific!
OK, enable/allow previous broken, bad behavior iff the user
really, really wants it. And warn that b-m isn't recommended
in those cases.
rjung's suggestions...
inherit inherit
Use inherit_set to let the global server set
the default for all vhosts.
Otherwise inherit would need to be disabled
redundantly in each vhost.
restrict inherit control to those fields that "require" it...
Redfine - we are just worried about balancers and workers, so have the directive clear about that.
Naming
ProxyPassInherit directive
Submitted by: jim, rjung, jim, jim, jim, jim
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477649 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -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 715acb6507..b054ab4d77 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -403,6 +403,7 @@ * 20120211.11 (2.4.4-dev) Add ap_bin2hex() * 20120211.12 (2.4.5-dev) Add ap_remove_input|output_filter_byhandle() * 20120211.13 (2.4.5-dev) Add ap_get_exec_line + * 20120211.14 (2.4.5-dev) Add ppinherit and inherit to proxy_server_conf */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -410,7 +411,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120211 #endif -#define MODULE_MAGIC_NUMBER_MINOR 13 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 14 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a |