diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-09-27 02:52:26 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-09-27 02:52:26 +0000 |
| commit | 936af4387d81e213b5945e8ef5d81205c2b25837 (patch) | |
| tree | 45e592bed14bc3ee6a21cb1820cf04d2a89dc0cb /www/apache13-fp/files/patch-aa | |
| parent | Update to version 1.30.4. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=21991
Diffstat (limited to 'www/apache13-fp/files/patch-aa')
| -rw-r--r-- | www/apache13-fp/files/patch-aa | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/www/apache13-fp/files/patch-aa b/www/apache13-fp/files/patch-aa index 0a8331b57ddf..9eaa76b058c3 100644 --- a/www/apache13-fp/files/patch-aa +++ b/www/apache13-fp/files/patch-aa @@ -1,14 +1,15 @@ ---- configure.orig Sat Jan 2 07:19:41 1999 -+++ configure Mon Jan 18 17:18:16 1999 -@@ -953,6 +953,7 @@ +--- 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. ## - ## determine special configuration parameters - ## -+conf_user="nobody" - conf_group="#-1" + conf_user="nobody" +-conf_group="#-1" ++conf_group="nogroup" conf_port="80" conf_serveradmin="you@your.address" -@@ -971,6 +972,9 @@ + 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 @@ -18,7 +19,7 @@ ## ## determine prefix-relative paths for directories -@@ -1012,8 +1016,8 @@ +@@ -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" @@ -29,15 +30,7 @@ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1068,6 +1072,7 @@ - -e "s%@suexec_uidmin@%$suexec_uidmin%g" \ - -e "s%@suexec_gidmin@%$suexec_gidmin%g" \ - -e "s%@suexec_safepath@%$suexec_safepath%g" \ -+-e "s%@conf_user@%$conf_user%g" \ - -e "s%@conf_group@%$conf_group%g" \ - -e "s%@conf_port@%$conf_port%g" \ - -e "s%@conf_serveradmin@%$conf_serveradmin%g" \ -@@ -1091,8 +1096,8 @@ +@@ -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 |