*) Windows: Make UNCList EXEC_ON_READ to be early enough for

     `Include //computername/include.conf`. PR69313
     Trunk version of patch:
       https://svn.apache.org/r1920564
     Backport version for 2.4.x of patch:
       svn merge -c r1920564 ^/httpd/httpd/trunk .
     +1 covener, rpluem, steffenal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1920979 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index db727016a5fd5f9dcc4c1b7c5181fc4f72550e05..cf7ebfc03abded32afa0f9fb10f1500f99ab3702 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.63
 
+  *) Windows: Restore the ability to "Include" configuration files on UNC
+     paths. PR69313 [Eric Covener]
+
   *) mod_proxy: Avoid AH01059 parsing error for SetHandler "unix:" URLs
      in <Location> (incomplete fix in 2.4.62). PR 69160. [Yann Ylavic]
 

diff --git a/server/core.c b/server/core.c
index 843b97320f86e40eef34a68281c94f79d11f6a3e..a27769f3d3137f3a86b6e0cd5f37d3f28c4bdd1f 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -4547,7 +4547,7 @@ AP_INIT_TAKE1("FlushMaxPipelined", set_flush_max_pipelined, NULL, RSRC_CONF,
   "Maximum number of pipelined responses (pending) above which they are "
   "flushed to the network"),
 #ifdef WIN32
-AP_INIT_TAKE_ARGV("UNCList", set_unc_list, NULL, RSRC_CONF,
+AP_INIT_TAKE_ARGV("UNCList", set_unc_list, NULL, RSRC_CONF|EXEC_ON_READ,
   "Controls what UNC hosts may be looked up"),
 #endif