Changeset 1035 for server

Timestamp:

Mar 28, 2009, 4:19:19 PM (16 years ago)

Author:

mitchb

Message:

Fix "the-bug" (non-empty content in 304s) in PHP (patch by ezyang) and Apache

PHP should not produce any output, even if zlib.output_compression is
on, if the HTTP response code is 204 or 304 (no content or not modified).
Fixes PHP bug #42362 with php.cvs #56693, see:
http://bugs.php.net/bug.php?id=42362
http://news.php.net/php.cvs/56693
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.5.2.9&r2=1.183.2.6.2.5.2.10

Apache should discard any body provided by a script (in any language, not
just PHP) when the status is "no content" or "not modified".
Addresses part of Apache bug #40953, see:
https://issues.apache.org/bugzilla/show_bug.cgi?id=40953#c7

Solves scripts.mit.edu support issue #773060, see:
https://help.mit.edu/Ticket/UpdateCallCenter.html?id=773060
https://diswww.mit.edu/charon/scripts/24018

Location:

server

Files:

• common/patches/httpd-2.2.x-304.patch (added)
• common/patches/php-scripts-304.patch (added)
• fedora/Makefile (modified) (1 diff)
• fedora/specs/httpd.spec.patch (modified) (5 diffs)
• fedora/specs/php.spec.patch (added)
• fedora/specs/scripts-base.spec (modified) (1 diff)

server/fedora/Makefile

@@ -19 +19 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum    = krb5 httpd openssh pysvn
+upstream_yum    = krb5 httpd openssh pysvn php
 upstream        = openafs $(upstream_yum)
 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i386 whoisd mit-zephyr nss-ldapd scripts-base

server/fedora/specs/httpd.spec.patch

@@ -1 +1 @@
 --- httpd.spec.orig     2009-03-28 13:32:47.000000000 -0400
-+++ httpd.spec  2009-03-28 13:48:25.000000000 -0400
++++ httpd.spec  2009-03-28 14:20:15.000000000 -0400
 @@ -6,7 +6,7 @@
  Summary: Apache HTTP Server
@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  Source1: index.html
-@@ -54,6 +54,11 @@
+@@ -54,6 +54,12 @@
  Conflicts: pcre < 4.0
  Requires: httpd-tools = %{version}-%{release}
@@ -18 +18 @@
 +Patch1001: httpd-2.2.x-sni.patch
 +Patch1003: httpd-2.2.x-mod_status-security.patch
++Patch1004: httpd-2.2.x-304.patch
 +
  %description
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -100,6 +105,7 @@
+@@ -100,6 +106,7 @@
  BuildRequires: openssl-devel, distcache-devel
  Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -30 +31 @@
  
  %description -n mod_ssl
-@@ -127,6 +133,10 @@
+@@ -127,6 +134,11 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -37 +38 @@
 +%patch1001 -p1 -b .sni
 +%patch1003 -p1 -b .permitstatus
++%patch1004 -p1 -b .scripts-304
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -175,10 +185,12 @@
+@@ -175,10 +187,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \

server/fedora/specs/scripts-base.spec

@@ -9 +9 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
-Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-pysvn
+Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-pysvn, scripts-php
 %define debug_package %{nil}