936af4387d
patch-au corrects a problem when either ResourceConfig/AccessConfig is
set to the apache configuration file (${PREFIX}/etc/apache/httpd.conf).
Without this patch, if you set the apache server to listen to alterate
ports the server would fail to start and the error log would contain:
[crit] (48)Address already in use: make_sock: could not bind to port 8000
ResourceConfig/AccessConfig can't be set to /dev/null. The fpsrvadm.exe
will not be able to obtain the DocumnetRoot from the ResourceConfig file
(/dev/null).
PR: 13673
Submitted by: maintainer
20 lines
689 B
Plaintext
20 lines
689 B
Plaintext
--- src/main/http_request.c.orig Fri May 21 07:16:21 1999
|
|
+++ src/main/http_request.c Mon Sep 6 13:12:55 1999
|
|
@@ -187,6 +187,8 @@
|
|
return OK;
|
|
}
|
|
|
|
+ if (r->execfilename) path = r->execfilename;
|
|
+
|
|
#ifdef HAVE_DRIVE_LETTERS
|
|
/* If the directory is x:\, then we don't want to strip
|
|
* the trailing slash since x: is not a valid directory.
|
|
@@ -511,6 +513,7 @@
|
|
res = ap_parse_htaccess(&htaccess_conf, r, overrides_here,
|
|
ap_pstrdup(r->pool, test_dirname),
|
|
sconf->access_name);
|
|
+ if (r->execfilename) r->filename = r->execfilename;
|
|
if (res)
|
|
return res;
|
|
|