- release 2

[packages/apache.git] / apache-mod_vhost_alias_docroot.patch

diff --git a/apache-mod_vhost_alias_docroot.patch b/apache-mod_vhost_alias_docroot.patch
index 6be421c9027a394945142049581d5fc3a30f869b..359ff5727933aca63f73e4ade91d83ba20d336dc 100644 (file)
--- a/apache-mod_vhost_alias_docroot.patch
+++ b/apache-mod_vhost_alias_docroot.patch
@@ -1,5 +1,5 @@
---- httpd-2.4.1/modules/mappers/mod_vhost_alias.c.orig 2011-06-05 23:33:12.000000000 +0200
-+++ httpd-2.4.1/modules/mappers/mod_vhost_alias.c      2012-02-22 00:31:43.952644535 +0100
+--- old/modules/mappers/mod_vhost_alias.c      2006-07-24 13:07:15.000000000 +0100
++++ new/modules/mappers/mod_vhost_alias.c      2006-07-24 13:09:21.000000000 +0100
 @@ -33,6 +33,8 @@
   * both written by James Grinter <jrg@blodwen.demon.co.uk>.
   */
@@ -8,7 +8,7 @@
 +
  #include "apr.h"
  #include "apr_strings.h"
- #include "ap_hooks.h"
+ #include "apr_hooks.h"
 @@ -67,6 +69,7 @@
      const char *cgi_root;
      mva_mode_e doc_root_mode;
@@ -75,20 +75,21 @@
  {
      /* 0..9 9..0 */
      enum { MAXDOTS = 19 };
-@@ -377,6 +399,12 @@
-     r->filename = apr_pstrcat(r->pool, docroot, uri, NULL);
-     ap_set_context_info(r, NULL, docroot);
-     ap_set_document_root(r, docroot);
+@@ -378,6 +400,13 @@
+     else {
+         r->filename = apr_pstrcat(r->pool, buf, uri, NULL);
+     }
++
 +    if (conf->set_doc_root) {
-+       request_rec *top = (r->main)?r->main:r;
-+       core_server_config *core = (core_server_config *) ap_get_module_config(r->server->module_config, &core_module);
++      request_rec *top = (r->main)?r->main:r;
++      core_server_config *core = (core_server_config *) ap_get_module_config(r->server->module_config, &core_module);
 +
-+       core->ap_document_root = apr_pstrdup(top->pool, buf);
++      core->ap_document_root = apr_pstrdup(top->pool, buf);
 +    }
  }
  
  static int mva_translate(request_rec *r)
-@@ -425,7 +453,7 @@
+@@ -426,7 +455,7 @@
       * canonical_path buffer.
       */
      r->canonical_filename = "";