Changeset 1035


Ignore:
Timestamp:
Mar 28, 2009, 4:19:19 PM (15 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:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • server/fedora/Makefile

    r1024 r1035  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 httpd openssh pysvn
     21upstream_yum    = krb5 httpd openssh pysvn php
    2222upstream        = openafs $(upstream_yum)
    2323oursrc          = 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

    r1034 r1035  
    11--- httpd.spec.orig     2009-03-28 13:32:47.000000000 -0400
    2 +++ httpd.spec  2009-03-28 13:48:25.000000000 -0400
     2+++ httpd.spec  2009-03-28 14:20:15.000000000 -0400
    33@@ -6,7 +6,7 @@
    44 Summary: Apache HTTP Server
     
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1111 Source1: index.html
    12 @@ -54,6 +54,11 @@
     12@@ -54,6 +54,12 @@
    1313 Conflicts: pcre < 4.0
    1414 Requires: httpd-tools = %{version}-%{release}
     
    1818+Patch1001: httpd-2.2.x-sni.patch
    1919+Patch1003: httpd-2.2.x-mod_status-security.patch
     20+Patch1004: httpd-2.2.x-304.patch
    2021+
    2122 %description
    2223 The Apache HTTP Server is a powerful, efficient, and extensible
    2324 web server.
    24 @@ -100,6 +105,7 @@
     25@@ -100,6 +106,7 @@
    2526 BuildRequires: openssl-devel, distcache-devel
    2627 Requires(post): openssl >= 0.9.7f-4, /bin/cat
     
    3031 
    3132 %description -n mod_ssl
    32 @@ -127,6 +133,10 @@
     33@@ -127,6 +134,11 @@
    3334 # Patch in vendor/release string
    3435 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    3738+%patch1001 -p1 -b .sni
    3839+%patch1003 -p1 -b .permitstatus
     40+%patch1004 -p1 -b .scripts-304
    3941+
    4042 # Safety check: prevent build if defined MMN does not equal upstream MMN.
    4143 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    4244 if test "x${vmmn}" != "x%{mmn}"; then
    43 @@ -175,10 +185,12 @@
     45@@ -175,10 +187,12 @@
    4446         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    4547        --enable-suexec --with-suexec \
  • server/fedora/specs/scripts-base.spec

    r1024 r1035  
    99Source: %{name}.tar.gz
    1010BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
    11 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
     11Requires: 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
    1212%define debug_package %{nil}
    1313
Note: See TracChangeset for help on using the changeset viewer.