X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache-mod_vhost_alias_docroot.patch;h=6be421c9027a394945142049581d5fc3a30f869b;hp=359ff5727933aca63f73e4ade91d83ba20d336dc;hb=1801affac7121bb9bb4859fc0d083a7353ea8589;hpb=03fa0e1eac0d3851c5ae1ab08a02cc3a5ee4eb69 diff --git a/apache-mod_vhost_alias_docroot.patch b/apache-mod_vhost_alias_docroot.patch index 359ff57..6be421c 100644 --- a/apache-mod_vhost_alias_docroot.patch +++ b/apache-mod_vhost_alias_docroot.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -33,6 +33,8 @@ * both written by James Grinter . */ @@ -8,7 +8,7 @@ + #include "apr.h" #include "apr_strings.h" - #include "apr_hooks.h" + #include "ap_hooks.h" @@ -67,6 +69,7 @@ const char *cgi_root; mva_mode_e doc_root_mode; @@ -75,21 +75,20 @@ { /* 0..9 9..0 */ enum { MAXDOTS = 19 }; -@@ -378,6 +400,13 @@ - else { - r->filename = apr_pstrcat(r->pool, buf, uri, NULL); - } -+ +@@ -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); + 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) -@@ -426,7 +455,7 @@ +@@ -425,7 +453,7 @@ * canonical_path buffer. */ r->canonical_filename = "";