- possible fix for segfault when serializing objects (as described on

  pld-devel-pl)
- release 4.1

Changed files:
    php.spec -> 1.476
    php_bug34435.patch -> 1.1

diff --git a/php.spec b/php.spec
index b59aa55ce55579328afbb6da2cb790e277a7df36..560a44fc55082632059d07051325261aef298999 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -77,7 +77,7 @@ Summary(ru):  PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 5 - ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       5.0.5
-Release:       4%{?with_hardening:hardened}
+Release:       4.1%{?with_hardening:hardened}
 Epoch:         4
 Group:         Libraries
 License:       PHP
@@ -126,6 +126,7 @@ Patch29:    %{name}-gcc4.patch
 Patch30:       %{name}-hardening-fix.patch
 Patch31:       %{name}-both-apxs.patch
 Patch32:       %{name}-builddir.patch
+Patch33:       %{name}_bug34435.patch
 Icon:          php.gif
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
@@ -1485,6 +1486,7 @@ patch -p1 < %{PATCH30}
 %endif
 %patch31 -p1
 %patch32 -p1
+%patch33 -p0
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4

diff --git a/php_bug34435.patch b/php_bug34435.patch
new file mode 100644 (file)
index 0000000..716a029
--- /dev/null
+++ b/php_bug34435.patch
@@ -0,0 +1,42 @@
+--- ./ext/standard/incomplete_class.c.bug34435 2004-11-25 20:28:37.000000000 +0000
++++ ./ext/standard/incomplete_class.c  2005-09-09 13:00:39.000000000 +0100
+@@ -122,7 +122,7 @@
+ 
+ /* {{{ php_lookup_class_name
+  */
+-char *php_lookup_class_name(zval *object, size_t *nlen)
++char *php_lookup_class_name(zval *object, zend_uint *nlen)
+ {
+       zval **val;
+       char *retval = NULL;
+@@ -144,7 +144,7 @@
+ 
+ /* {{{ php_store_class_name
+  */
+-void php_store_class_name(zval *object, const char *name, size_t len)
++void php_store_class_name(zval *object, const char *name, zend_uint len)
+ {
+       zval *val;
+       TSRMLS_FETCH();
+--- ./ext/standard/php_incomplete_class.h.bug34435     2005-06-29 10:29:08.000000000 +0100
++++ ./ext/standard/php_incomplete_class.h      2005-09-09 13:00:31.000000000 +0100
+@@ -42,7 +42,7 @@
+ 
+ #define PHP_CLASS_ATTRIBUTES                                                                                  \
+       char *class_name;                                                                                                       \
+-      size_t name_len;                                                                                                        \
++      zend_uint name_len;                                                                                                     \
+       zend_bool free_class_name = 0;                                                                          \
+       zend_bool incomplete_class = 0
+ 
+@@ -55,8 +55,8 @@
+       
+ zend_class_entry *php_create_incomplete_class(TSRMLS_D);
+ 
+-char *php_lookup_class_name(zval *object, size_t *nlen);
+-void  php_store_class_name(zval *object, const char *name, size_t len);
++char *php_lookup_class_name(zval *object, zend_uint *nlen);
++void  php_store_class_name(zval *object, const char *name, zend_uint len);
+ 
+ #ifdef __cplusplus
+ };