You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2014/05/14 12:50:08 UTC
svn commit: r1594539 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/mappers/mod_alias.c
Author: trawick
Date: Wed May 14 10:50:08 2014
New Revision: 1594539
URL: http://svn.apache.org/r1594539
Log:
Merge r1583175 and r1593745 from trunk:
mod_alias: Stop setting CONTEXT_PREFIX and CONTEXT_DOCUMENT environment
variables as a result of AliasMatch.
Submitted by: covener
Reviewed by: jim, ylavic
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/mappers/mod_alias.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1583175,1593745
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1594539&r1=1594538&r2=1594539&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed May 14 10:50:08 2014
@@ -2,6 +2,9 @@
Changes with Apache 2.4.10
+ *) mod_alias: Stop setting CONTEXT_PREFIX and CONTEXT_DOCUMENT environment
+ variables as a result of AliasMatch. [Eric Covener]
+
*) mod_proxy_scgi: Support Unix sockets. ap_proxy_port_of_scheme():
Support default SCGI port (4000). [Jeff Trawick]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1594539&r1=1594538&r2=1594539&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed May 14 10:50:08 2014
@@ -100,12 +100,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_alias: Stop setting context document root for AliasMatch.
- trunk patch: http://svn.apache.org/r1583175
- http://svn.apache.org/r1593745
- 2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-aliasmatch_contextinfo.diff
- +1 covener, jim, ylavic
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_alias.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_alias.c?rev=1594539&r1=1594538&r2=1594539&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_alias.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_alias.c Wed May 14 10:50:08 2014
@@ -370,17 +370,6 @@ static char *try_alias_list(request_rec
uri.fragment, NULL);
}
}
- else {
- int pathlen = strlen(found) -
- (strlen(r->uri + regm[0].rm_eo));
- AP_DEBUG_ASSERT(pathlen >= 0);
- AP_DEBUG_ASSERT(pathlen <= strlen(found));
- ap_set_context_info(r,
- apr_pstrmemdup(r->pool, r->uri,
- regm[0].rm_eo),
- apr_pstrmemdup(r->pool, found,
- pathlen));
- }
}
else {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00672)