diff options
author | jorton <jorton@fedoraproject.org> | 2008-07-14 14:09:16 +0000 |
---|---|---|
committer | jorton <jorton@fedoraproject.org> | 2008-07-14 14:09:16 +0000 |
commit | 6a329279c7ec925a4edf5a9572299e9f97299ecf (patch) | |
tree | 49e3f563fbb448b61f01842cedefbbd99dda3525 | |
parent | 1485e70b593a07c2ad5622a81ff51f7b2b9c207f (diff) | |
download | httpd-6a329279c7ec925a4edf5a9572299e9f97299ecf.tar.gz httpd-6a329279c7ec925a4edf5a9572299e9f97299ecf.tar.xz httpd-6a329279c7ec925a4edf5a9572299e9f97299ecf.zip |
- use Charset=UTF-8 in default httpd.conf (#455123)
- only enable suexec when appropriate (Jim Radford, #453697)
-rw-r--r-- | httpd-2.2.9-suenable.patch | 11 | ||||
-rw-r--r-- | httpd.conf | 2 | ||||
-rw-r--r-- | httpd.spec | 8 |
3 files changed, 19 insertions, 2 deletions
diff --git a/httpd-2.2.9-suenable.patch b/httpd-2.2.9-suenable.patch new file mode 100644 index 0000000..2227632 --- /dev/null +++ b/httpd-2.2.9-suenable.patch @@ -0,0 +1,11 @@ +--- 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; + } + } + @@ -588,7 +588,7 @@ ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" # 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 @@ -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 @@ Patch22: httpd-2.1.10-pod.patch 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 @@ Security (TLS) protocols. %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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/httpd/build/*.sh %changelog +* Mon Jul 14 2008 Joe Orton <jorton@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@redhat.com> 2.2.9-3 - rebuild against new db4 4.7 |