From 53326aac4e0dbd665f6df1db0ae1445bc8b0d557 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:21:42 +0000 Subject: [PATCH] auto-import changelog data from httpd-2.0.50-4.src.rpm Tue Aug 17 2004 Joe Orton 2.0.50-4 - start httpd in the C locale by default (#128002) - fix CustomLog comments in default httpd.conf (#43223) - ensure correct mod_suexec vs mod_userdir hook ordering (Joshua Slive, upstream #18156) --- README.confd | 5 +++++ httpd.conf | 9 ++++----- httpd.init | 7 +++++-- httpd.spec | 14 +++++++++++--- index.html | 12 ++++++------ 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/README.confd b/README.confd index d82037a..c12e149 100644 --- a/README.confd +++ b/README.confd @@ -2,3 +2,8 @@ This directory holds Apache 2.0 module-specific configuration files; any files in this directory which have the ".conf" extension will be processed as Apache configuration files. + +Files are processed in alphabetical order, so if using configuration +directives which depend on, say, mod_perl being loaded, ensure that +these are placed in a filename later in the sort order than "perl.conf". + diff --git a/httpd.conf b/httpd.conf index cb75586..01d6220 100644 --- a/httpd.conf +++ b/httpd.conf @@ -478,8 +478,7 @@ LogFormat "%{User-agent}i" agent # define per- access logfiles, transactions will be # logged therein and *not* in this file. # -# CustomLog logs/access_log common -CustomLog logs/access_log combined +#CustomLog logs/access_log common # # If you would like to have agent and referer logfiles, uncomment the @@ -489,10 +488,10 @@ CustomLog logs/access_log combined #CustomLog logs/agent_log agent # -# If you prefer a single logfile with access, agent, and referer information -# (Combined Logfile Format) you can use the following directive. +# For a single logfile with access, agent, and referer information +# (Combined Logfile Format), use the following directive: # -#CustomLog logs/access_log combined +CustomLog logs/access_log combined # # Optionally add a line containing the server version and virtual host diff --git a/httpd.init b/httpd.init index 698c66f..d705aba 100755 --- a/httpd.init +++ b/httpd.init @@ -17,6 +17,9 @@ if [ -f /etc/sysconfig/httpd ]; then . /etc/sysconfig/httpd fi +# Start httpd in the C locale by default. +HTTPD_LANG=${HTTPD_LANG-"C"} + # This will prevent initlog from swallowing up a pass-phrase prompt if # mod_ssl needs a pass-phrase from the user. INITLOG_ARGS="" @@ -39,7 +42,7 @@ check13 () { GONE="(ServerType|BindAddress|Port|AddModule|ClearModuleList|" GONE="${GONE}AgentLog|RefererLog|RefererIgnore|FancyIndexing|" GONE="${GONE}AccessConfig|ResourceConfig)" - if grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then + if LANG=C grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then echo echo 1>&2 " Apache 1.3 configuration directives found" echo 1>&2 " please read @docdir@/migration.html" @@ -56,7 +59,7 @@ check13 () { start() { echo -n $"Starting $prog: " check13 || exit 1 - daemon $httpd $OPTIONS + LANG=$HTTPD_LANG daemon $httpd $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch ${lockfile} diff --git a/httpd.spec b/httpd.spec index 3de19a7..930a556 100644 --- a/httpd.spec +++ b/httpd.spec @@ -1,13 +1,13 @@ %define contentdir /var/www %define suexec_caller apache %define mmn 20020903 -%define vstring Red Hat -%define distro Red Hat Enterprise Linux +%define vstring Fedora +%define distro Fedora Core Summary: Apache HTTP Server Name: httpd Version: 2.0.50 -Release: 3.ent +Release: 4 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -50,6 +50,7 @@ Patch30: httpd-2.0.48-davmisc.patch Patch32: httpd-2.0.48-vhost.patch Patch35: httpd-2.0.49-eocbucket.patch Patch37: httpd-2.0.46-autoindex.patch +Patch38: httpd-2.0.50-userdir.patch # Features/functional changes Patch70: httpd-2.0.48-release.patch Patch71: httpd-2.0.40-xfsz.patch @@ -162,6 +163,7 @@ executed by SSI pages) as a user other than the 'apache' user. %patch32 -p1 -b .vhost %patch35 -p1 -b .eocbucket %patch37 -p1 -b .autoindex +%patch38 -p1 -b .userdir %patch71 -p0 -b .xfsz %patch72 -p1 -b .pod @@ -578,6 +580,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/suexec.8* %changelog +* Tue Aug 17 2004 Joe Orton 2.0.50-4 +- start httpd in the C locale by default (#128002) +- fix CustomLog comments in default httpd.conf (#43223) +- ensure correct mod_suexec vs mod_userdir hook ordering + (Joshua Slive, upstream #18156) + * Tue Jun 29 2004 Joe Orton 2.0.50-3 - update -proxy11 patch - explain where suexec went if SuexecUserGroup is used but diff --git a/index.html b/index.html index 7f33e0f..37d41a8 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - Test Page for the Apache HTTP Server on Red Hat Enterprise Linux + Test Page for the Apache HTTP Server on Fedora Core