diff options
Diffstat (limited to 'www/apache/patches/patch-af')
| -rw-r--r-- | www/apache/patches/patch-af | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af index a89a8f7845c..9cb08f242d6 100644 --- a/www/apache/patches/patch-af +++ b/www/apache/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $ +$NetBSD: patch-af,v 1.5 1999/11/21 22:09:28 tron Exp $ ---- src/modules/standard/mod_include.c.orig Thu Sep 24 10:06:42 1998 -+++ src/modules/standard/mod_include.c Mon Dec 7 11:17:39 1998 +--- src/modules/standard/mod_include.c.orig Sat May 22 08:57:57 1999 ++++ src/modules/standard/mod_include.c Mon Oct 4 20:53:14 1999 @@ -92,7 +92,11 @@ #include "http_log.h" #include "http_main.h" @@ -43,17 +43,18 @@ $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $ error_fmt = "unable to include file \"%s\" " "in parsed file %s"; } -@@ -1010,7 +1016,8 @@ - int ret=0; - - if (!strcmp(tag, "file")) { -- ap_getparents(tag_val); /* get rid of any nasties */ -+ if (ap_allow_options(r) & OPT_INCNOEXEC) -+ ap_getparents(tag_val); /* get rid of any nasties */ - - rr = ap_sub_req_lookup_file(tag_val, r); +@@ -1057,7 +1063,9 @@ + "in parsed file %s"; + } + else { +- ap_getparents(tag_val); /* get rid of any nasties */ ++ if (ap_allow_options(r) & OPT_INCNOEXEC) ++ ap_getparents(tag_val); /* get rid of any nasties */ ++ + rr = ap_sub_req_lookup_file(tag_val, r); -@@ -2090,6 +2097,16 @@ + if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) { +@@ -2135,6 +2143,16 @@ } } @@ -70,7 +71,7 @@ $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $ /* -------------------------- The main function --------------------------- */ -@@ -2214,6 +2231,13 @@ +@@ -2259,6 +2277,13 @@ } #endif else { @@ -82,5 +83,5 @@ $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $ + continue; + ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r, - "httpd: unknown directive \"%s\" " - "in parsed doc %s", + "unknown directive \"%s\" " + "in parsed doc %s", |