stop setting context info for AliasMatch. These concepts do not really map

well/reliably to AliasMatch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1593745 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 58bcb44b20bfdfc0acd9f7586e675092fdcb898b..521d811aca0b1b6462ec19a0dd925ea6f4f3f44f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_alias: Stop setting CONTEXT_PREFIX and CONTEXT_DOCUMENT environment
+     variables as a result of AliasMatch. [Eric Covener]
+ 
   *) mod_proxy_fcgi: Fix occasional high CPU when handling request bodies.
      [Jeff Trawick]
 

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index 31d2b700943d67f213ea8ff9735c7d23dea55fc1..dfba13320e491b2c81f40d1f877617a6dc2642c8 100644 (file)
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -370,13 +370,6 @@ static char *try_alias_list(request_rec *r, apr_array_header_t *aliases,
                                                     uri.fragment, NULL);
                             }
                        }
-                       else {
-                           ap_set_context_info(r,
-                                               apr_pstrmemdup(r->pool, r->uri,
-                                                              regm[0].rm_eo),
-                                               apr_pstrmemdup(r->pool, found,
-                                                              strlen(found)));
-                       }
                     }
                     else {
                         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00672)