diff options
| author | Jim Jagielski <jim@apache.org> | 2014-01-23 14:33:09 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2014-01-23 14:33:09 +0000 |
| commit | 0e4717d45f98e39c0ece121e5f0b5d1f0cecf0a8 (patch) | |
| tree | afb351c3daf89f0db9e0a950a55492d13bb4e7f5 /include/ap_mmn.h | |
| parent | 7cf971441966ff8e54d4fa3ace3008cea1de74b8 (diff) | |
| download | httpd-0e4717d45f98e39c0ece121e5f0b5d1f0cecf0a8.tar.gz | |
Merge r1557641, r1559394, r1559398 from trunk:
don't search for directory indexes/directoryslashes if a URL is in the
middle of being rewritten [in per-dir context]. PR53929
followups to r1557641 suggested by nd -- add
prefix to both the macro and the handler name
itself.
no make depend in sandbox, fix bld break from r1559394
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560697 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 c95274246e..c164932329 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -424,6 +424,7 @@ * 20120211.27 (2.4.7-dev) Add ap_podx_restart_t and ap_mpm_podx_* * 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 */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -431,7 +432,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120211 #endif -#define MODULE_MAGIC_NUMBER_MINOR 29 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 30 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a |