Skip to content

Commit

Permalink
*) Windows: Make UNCList EXEC_ON_READ to be early enough for
Browse files Browse the repository at this point in the history
     `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
  • Loading branch information
covener committed Sep 27, 2024
1 parent 67982b7 commit 82736c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -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]

Expand Down
2 changes: 1 addition & 1 deletion server/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 82736c8

Please sign in to comment.