diff options
author | Jim Jagielski <jim@apache.org> | 2014-02-17 21:29:15 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2014-02-17 21:29:15 +0000 |
commit | cbd888e9728cf235b3205fd0a6f47c734bada3ad (patch) | |
tree | f0b273728844becf5812c91c272e0a36519a9248 /include | |
parent | 3726629f0f8b8d9a80d93170a1438b766c5b3311 (diff) | |
download | httpd-cbd888e9728cf235b3205fd0a6f47c734bada3ad.tar.gz |
Merge r1542562 from trunk:
We were not being consistent between http and others
if we added the default port or not during the canonizing
phase... Baseline the http method (don't add unless the
port provided isn't the default).
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569114 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 c164932329..79f26f4072 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -425,6 +425,7 @@ * 20120211.28 (2.4.7-dev) Add ap_regname * 20120211.29 (2.4.7-dev) Add uds_path to proxy_conn_rec * 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() */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -432,7 +433,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120211 #endif -#define MODULE_MAGIC_NUMBER_MINOR 30 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 31 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a |