Index: trunk/server/common/patches/php-scripts-304.patch
===================================================================
--- trunk/server/common/patches/php-scripts-304.patch	(revision 1358)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- php-5.2.8/ext/zlib/zlib.c.orig	2008-08-01 22:36:59.000000000 -0400
-+++ php-5.2.8/ext/zlib/zlib.c	2009-03-28 14:52:43.000000000 -0400
-@@ -979,7 +979,7 @@
- {
- 	zend_bool do_start, do_end;
- 
--	if (!ZLIBG(output_compression)) {
-+	if (!ZLIBG(output_compression) || SG(sapi_headers).http_response_code == 204 || SG(sapi_headers).http_response_code == 304) {
- 		*handled_output = NULL;
- 	} else {
- 		do_start = (mode & PHP_OUTPUT_HANDLER_START ? 1 : 0);
Index: trunk/server/fedora/Makefile
===================================================================
--- trunk/server/fedora/Makefile	(revision 1358)
+++ trunk/server/fedora/Makefile	(revision 1360)
@@ -19,5 +19,5 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum	= krb5 krb5.i586 httpd openssh php
+upstream_yum	= krb5 krb5.i586 httpd openssh
 upstream	= openafs $(upstream_yum)
 oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr athrun php_scripts scripts-base
Index: trunk/server/fedora/specs/php.spec.patch
===================================================================
--- trunk/server/fedora/specs/php.spec.patch	(revision 1358)
+++ 	(revision )
@@ -1,31 +1,0 @@
---- php.spec.orig	2009-04-15 09:24:35.000000000 -0400
-+++ php.spec	2009-06-03 05:40:37.000000000 -0400
-@@ -7,7 +7,7 @@
- Summary: PHP scripting language for creating dynamic web sites
- Name: php
- Version: 5.2.9
--Release: 2%{?dist}
-+Release: 2%{?dist}.scripts.%{scriptsversion}
- License: PHP
- Group: Development/Languages
- URL: http://www.php.net/
-@@ -39,6 +39,10 @@
- Patch60: php-5.2.7-tests-dashn.patch
- Patch61: php-5.0.4-tests-wddx.patch
- 
-+# Fix for the-bug (PHP bug #42362, php.cvs #56693)
-+Provides: scripts-php
-+Patch100: php-scripts-304.patch
-+
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
- BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
-@@ -404,6 +408,8 @@
- %patch60 -p1 -b .tests-dashn
- %patch61 -p1 -b .tests-wddx
- 
-+%patch100 -p1 -b .scripts-304
-+
- # Prevent %%doc confusion over LICENSE files
- cp Zend/LICENSE Zend/ZEND_LICENSE
- cp TSRM/LICENSE TSRM_LICENSE
Index: trunk/server/fedora/specs/scripts-base.spec
===================================================================
--- trunk/server/fedora/specs/scripts-base.spec	(revision 1358)
+++ trunk/server/fedora/specs/scripts-base.spec	(revision 1360)
@@ -9,5 +9,5 @@
 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-php, php_scripts
+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, php_scripts
 %define debug_package %{nil}