1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-28 21:29:28 +00:00
freebsd-ports/www/apache13-fp/files/patch-aa
Steve Price 936af4387d Update to use Apache version 1.3.9. Misc. notes from maintainer:
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
1999-09-27 02:52:26 +00:00

44 lines
2.2 KiB
Plaintext

--- configure.orig Sat Aug 14 03:29:05 1999
+++ configure Mon Sep 6 12:36:24 1999
@@ -1084,7 +1084,7 @@
## UID/GID as production oriented as a web server in NIS anyway.
##
conf_user="nobody"
-conf_group="#-1"
+conf_group="nogroup"
conf_port="80"
conf_serveradmin="you@your.address"
conf_servername="new.host.name"
@@ -1109,6 +1109,9 @@
conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`"
conf_servername="`$aux/buildinfo.sh -n %h%d`"
fi
+if [ ".$suexec" = .1 ]; then
+ conf_user="$suexec_caller"
+fi
##
## determine prefix-relative paths for directories
@@ -1153,8 +1156,8 @@
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
- echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
+ echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
+ echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
@@ -1244,8 +1247,8 @@
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci