rpms/httpd/devel httpd-2.2.9-suenable.patch, NONE, 1.1 httpd.conf, 1.26, 1.27 httpd.spec, 1.123, 1.124

Joe Orton (jorton) fedora-extras-commits at redhat.com
Mon Jul 14 14:10:55 UTC 2008


Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27634

Modified Files:
	httpd.conf httpd.spec 
Added Files:
	httpd-2.2.9-suenable.patch 
Log Message:
* Mon Jul 14 2008 Joe Orton <jorton at redhat.com> 2.2.9-4
- use Charset=UTF-8 in default httpd.conf (#455123)
- only enable suexec when appropriate (Jim Radford, #453697)


httpd-2.2.9-suenable.patch:

--- NEW FILE httpd-2.2.9-suenable.patch ---
--- httpd-2.2.9/os/unix/unixd.c.suenable
+++ httpd-2.2.9/os/unix/unixd.c
@@ -215,7 +215,7 @@ AP_DECLARE(void) unixd_pre_config(apr_po
     }
 
     if ((wrapper.protection & APR_USETID) && wrapper.user == 0) {
-        unixd_config.suexec_enabled = 1;
+        unixd_config.suexec_enabled = access(SUEXEC_BIN, R_OK|X_OK) == 0;
     }
 }
 


Index: httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- httpd.conf	4 Jun 2008 11:33:29 -0000	1.26
+++ httpd.conf	14 Jul 2008 14:09:16 -0000	1.27
@@ -588,7 +588,7 @@
 # IndexOptions: Controls the appearance of server-generated directory
 # listings.
 #
-IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable
+IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable Charset=UTF-8
 
 #
 # AddIcon* directives tell the server which icon to show for different


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- httpd.spec	10 Jul 2008 17:56:25 -0000	1.123
+++ httpd.spec	14 Jul 2008 14:09:16 -0000	1.124
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.9
-Release: 3
+Release: 4
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -34,6 +34,7 @@
 Patch23: httpd-2.0.45-export.patch
 Patch24: httpd-2.0.48-corelimit.patch
 Patch25: httpd-2.0.54-selinux.patch
+Patch26: httpd-2.2.9-suenable.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
 Patch55: httpd-2.2.4-oldflush.patch
@@ -121,6 +122,7 @@
 %patch23 -p1 -b .export
 %patch24 -p1 -b .corelimit
 %patch25 -p1 -b .selinux
+%patch26 -p1 -b .suenable
 
 %patch54 -p1 -b .authnoprov
 %patch55 -p1 -b .oldflush
@@ -478,6 +480,10 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Mon Jul 14 2008 Joe Orton <jorton at redhat.com> 2.2.9-4
+- use Charset=UTF-8 in default httpd.conf (#455123)
+- only enable suexec when appropriate (Jim Radford, #453697)
+
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com>  2.2.9-3
 - rebuild against new db4 4.7
 




More information about the fedora-extras-commits mailing list