From 82736c811b0af3f85dfdf29abdef1e759063c7b7 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Fri, 27 Sep 2024 13:08:17 +0000 Subject: [PATCH] *) 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 --- CHANGES | 3 +++ server/core.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index db727016a5f..cf7ebfc03ab 100644 --- 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 (incomplete fix in 2.4.62). PR 69160. [Yann Ylavic] diff --git a/server/core.c b/server/core.c index 843b97320f8..a27769f3d31 100644 --- 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