rpms/php/devel php-5.2.3-brigade.patch, NONE, 1.1 php.spec, 1.141, 1.142

Joe Orton (jorton) fedora-extras-commits at redhat.com
Mon Jul 2 09:50:41 UTC 2007


Author: jorton

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

Modified Files:
	php.spec 
Added Files:
	php-5.2.3-brigade.patch 
Log Message:
* Mon Jul  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-4
- obsolete php-dbase


php-5.2.3-brigade.patch:

--- NEW FILE php-5.2.3-brigade.patch ---
--- php-5.2.3/sapi/apache2handler/sapi_apache2.c.brigade
+++ php-5.2.3/sapi/apache2handler/sapi_apache2.c
@@ -634,6 +634,7 @@
 	if (!parent_req) {
 		php_apache_request_dtor(r TSRMLS_CC);
 		ctx->request_processed = 1;
+		brigade = apr_brigade_create(r->pool, r->connection->bucket_alloc);
 		bucket = apr_bucket_eos_create(r->connection->bucket_alloc);
 		APR_BRIGADE_INSERT_TAIL(brigade, bucket);
 


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- php.spec	19 Jun 2007 17:21:43 -0000	1.141
+++ php.spec	2 Jul 2007 09:50:06 -0000	1.142
@@ -6,7 +6,7 @@
 Summary: The PHP HTML-embedded scripting language
 Name: php
 Version: 5.2.3
-Release: 3
+Release: 4
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -87,7 +87,7 @@
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
 Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
 Provides: php-wddx, php-zlib, php-json, php-zip, php-dbase
-Obsoletes: php-openssl, php-pecl-zip, php-json
+Obsoletes: php-openssl, php-pecl-zip, php-json, php-dbase
 
 %description common
 The php-common package contains files used by both the php
@@ -678,6 +678,9 @@
 %files mssql -f files.mssql
 
 %changelog
+* Mon Jul  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-4
+- obsolete php-dbase
+
 * Tue Jun 19 2007 Joe Orton <jorton at redhat.com> 5.2.3-3
 - add mcrypt, mhash, tidy, mssql subpackages (Dmitry Butskoy)
 - enable dbase extension and package in -common




More information about the scm-commits mailing list