rpms/httpd/devel httpd.conf, 1.19, 1.20 httpd.spec, 1.65, 1.66 httpd-2.0.54-cgid.patch, 1.1, NONE httpd-2.0.54-layout.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 27 14:33:47 UTC 2005
Author: jorton
Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20507
Modified Files:
httpd.conf httpd.spec
Removed Files:
httpd-2.0.54-cgid.patch httpd-2.0.54-layout.patch
Log Message:
- revert commit which was supposed to be in a scratch branch
Index: httpd.conf
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- httpd.conf 27 Apr 2005 14:00:28 -0000 1.19
+++ httpd.conf 27 Apr 2005 14:33:45 -0000 1.20
@@ -186,12 +186,7 @@
LoadModule disk_cache_module modules/mod_disk_cache.so
LoadModule file_cache_module modules/mod_file_cache.so
LoadModule mem_cache_module modules/mod_mem_cache.so
-<IfModule prefork.c>
LoadModule cgi_module modules/mod_cgi.so
-</IfModule>
-<IfModule worker.c>
-LoadModule cgid_module modules/mod_cgid.so
-</IfModule>
#
# Load config files from the config directory "/etc/httpd/conf.d".
Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- httpd.spec 27 Apr 2005 14:00:28 -0000 1.65
+++ httpd.spec 27 Apr 2005 14:33:45 -0000 1.66
@@ -7,7 +7,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.0.54
-Release: 7
+Release: 6
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -33,10 +33,8 @@
Patch4: httpd-2.0.45-deplibs.patch
Patch5: httpd-2.0.47-pie.patch
Patch6: httpd-2.0.45-syspcre.patch
-Patch7: httpd-2.0.54-layout.patch
Patch8: httpd-2.0.48-vpathinc.patch
Patch9: httpd-2.0.52-apctlopts.patch
-Patch10: httpd-2.0.54-cgid.patch
# Bug fixes
Patch20: httpd-2.0.45-encode.patch
Patch21: httpd-2.0.45-davetag.patch
@@ -138,10 +136,8 @@
%patch4 -p1 -b .deplibs
%patch5 -p1 -b .pie
%patch6 -p1 -b .syspcre
-%patch7 -p1 -b .layout
%patch8 -p1 -b .vpathinc
%patch9 -p1 -b .apctlopts
-%patch10 -p1 -b .cgid
# no -b to prevent droplets in install root
%patch20 -p1
@@ -302,9 +298,6 @@
# for holding mod_dav lock database
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav
-# for holding transient run-time state
-mkdir $RPM_BUILD_ROOT%{_localstatedir}/run/httpd
-
# create a prototype session cache
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_ssl
touch $RPM_BUILD_ROOT%{_localstatedir}/cache/mod_ssl/scache.{dir,pag,sem}
@@ -521,8 +514,6 @@
%config %{contentdir}/error/*.var
%config %{contentdir}/error/include/*.html
-%attr(0700,apache,apache) %dir %{_localstatedir}/run/httpd
-
%attr(0700,root,root) %dir %{_localstatedir}/log/httpd
%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/mod_proxy
@@ -556,9 +547,6 @@
%{_libdir}/httpd/build/libtool
%changelog
-* Wed Apr 27 2005 Joe Orton <jorton at redhat.com> 2.0.54-7
-- enable cgid in default config for worker
-
* Tue Apr 26 2005 Joe Orton <jorton at redhat.com> 2.0.54-6
- fix key/cert locations in post script
--- httpd-2.0.54-cgid.patch DELETED ---
--- httpd-2.0.54-layout.patch DELETED ---
More information about the fedora-cvs-commits
mailing list