commit 77bae55c9214891fbeed6ff3c957e9fabdfb0daa
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Aug 29 16:02:38 2013 +0200
- rel 2; fix bug 60598
php-bug-60598.patch | 16 ++++++++++++++++
php.spec | 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 0760e34..63d5c50 100644
--- a/php.spec
+++ b/php.spec
@@ -128,7 +128,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%undefine with_filter
%endif
-%define rel 1
+%define rel 2
%define orgname php
%define ver_suffix 55
%define php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -217,6 +217,7 @@ Patch63: %{orgname}-mysql-nowarning.patch
#Patch64: %{orgname}-m4.patch # not needed on 5.4 branch
Patch65: system-libzip.patch
Patch66: php-db.patch
+Patch67: php-bug-60598.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -1950,6 +1951,7 @@ cp -p php.ini-production php.ini
%patch63 -p1
%{?with_system_libzip:%patch65 -p1}
%patch66 -p1
+%patch67 -p1
sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#'
ext/xmlrpc/config.m4
diff --git a/php-bug-60598.patch b/php-bug-60598.patch
new file mode 100644
index 0000000..613889f
--- /dev/null
+++ b/php-bug-60598.patch
@@ -0,0 +1,16 @@
+diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
+index 1fe5d0c..b5dd48f 100644
+--- a/Zend/zend_objects_API.c
++++ b/Zend/zend_objects_API.c
+@@ -57,6 +57,11 @@ ZEND_API void
zend_objects_store_call_destructors(zend_objects_store *objects TS
+ obj->dtor(obj->object, i TSRMLS_CC);
+ obj =
&objects->object_buckets[i].bucket.obj;
+ obj->refcount--;
++
++ if (obj->refcount == 0) {
++ /* in case gc_collect_cycle is
triggered before free_storage */
++ GC_REMOVE_ZOBJ_FROM_BUFFER(obj);
++ }
+ }
+ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/77bae55c9214891fbeed6ff3c957e9fabdfb0daa
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
