rpms/httpd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- apachectl: restore use of $OPTIONS again

Browse Source
This commit is contained in:
jorton 2005-03-02 08:17:41 +00:00
parent f61c39c58d
commit 4435419080
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
httpd.init
View File

@ -76,7 +76,8 @@ reload() {
echo -n $"Reloading $prog: " echo -n $"Reloading $prog: "
if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then
RETVAL=$? RETVAL=$?
failure $"not reloading $httpd due to configuration syntax error" echo $"not reloading due to configuration syntax error"
failure $"Not reloading $httpd due to configuration syntax errors"
else else
killproc $httpd -HUP killproc $httpd -HUP
RETVAL=$? RETVAL=$?

7
httpd.spec
View File

@ -7,7 +7,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.0.53 Version: 2.0.53
Release: 4 Release: 5
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html Source1: index.html
@ -38,6 +38,7 @@ Patch4: httpd-2.0.45-deplibs.patch
Patch5: httpd-2.0.47-pie.patch Patch5: httpd-2.0.47-pie.patch
Patch6: httpd-2.0.45-syspcre.patch Patch6: httpd-2.0.45-syspcre.patch
Patch8: httpd-2.0.48-vpathinc.patch Patch8: httpd-2.0.48-vpathinc.patch
Patch9: httpd-2.0.52-apctlopts.patch
# Bug fixes # Bug fixes
Patch20: httpd-2.0.45-encode.patch Patch20: httpd-2.0.45-encode.patch
Patch21: httpd-2.0.45-davetag.patch Patch21: httpd-2.0.45-davetag.patch
@ -149,6 +150,7 @@ executed by SSI pages) as a user other than the 'apache' user.
%patch4 -p1 -b .deplibs %patch4 -p1 -b .deplibs
%patch6 -p1 -b .syspcre %patch6 -p1 -b .syspcre
%patch8 -p1 -b .vpathinc %patch8 -p1 -b .vpathinc
%patch9 -p1 -b .apctlopts
# no -b to prevent droplets in install root # no -b to prevent droplets in install root
%patch20 -p1 %patch20 -p1
@ -594,6 +596,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/suexec.8* %{_mandir}/man8/suexec.8*
%changelog %changelog
* Wed Mar 2 2005 Joe Orton <jorton@redhat.com> 2.0.53-5
- apachectl: restore use of $OPTIONS again
* Wed Feb 9 2005 Joe Orton <jorton@redhat.com> 2.0.53-4 * Wed Feb 9 2005 Joe Orton <jorton@redhat.com> 2.0.53-4
- update to 2.0.53 - update to 2.0.53
- move prefork/worker modules comparison to %%check - move prefork/worker modules comparison to %%check