bc1d2c701085d0e03695d0102a51907d php-install_gd_headers.patch

[packages/php.git] / php-bug-35009.patch

diff --git a/php-bug-35009.patch b/php-bug-35009.patch
index ef08ed8bc1f15b9ab5526345065b4c8afade93b8..c45f1ba63ba9382037f8978b7358d619df658c52 100644 (file)
--- a/php-bug-35009.patch
+++ b/php-bug-35009.patch
@@ -1,35 +1,30 @@
-
-===================================================================
-RCS file: /repository/ZendEngine2/zend.c,v
-retrieving revision 1.287.2.12
-retrieving revision 1.287.2.14
-diff -p --unified=3 -r1.287.2.12 -r1.287.2.14
---- ./Zend/zend.c      2005/07/22 07:33:27     1.287.2.12
-+++ ./Zend/zend.c      2005/11/07 12:25:21     1.287.2.14
+--- php-4.4.1/Zend/zend.c      2005-06-09 13:14:25.000000000 +0300
++++ php4-STABLE-200511081543/Zend/zend.c       2005-11-07 16:01:13.000000000 +0200
 @@ -17,7 +17,7 @@
     +----------------------------------------------------------------------+
  */
-
+ 
 -/* $Id$ */
 +/* $Id$ */
-
+ 
  #include "zend.h"
  #include "zend_extensions.h"
-@@ -693,9 +693,7 @@ void zend_shutdown(TSRMLS_D)
+@@ -564,9 +564,7 @@
  #ifdef ZEND_WIN32
        zend_shutdown_timeout_thread();
  #endif
 -#ifndef ZTS
        zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
--#endif
+-#endif        
        zend_hash_graceful_reverse_destroy(&module_registry);
-
-       zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
-@@ -711,7 +709,6 @@ void zend_shutdown(TSRMLS_D)
-       free(GLOBAL_FUNCTION_TABLE);
-       free(GLOBAL_CLASS_TABLE);
+ 
+       zend_shutdown_extensions(TSRMLS_C);
+@@ -584,8 +582,6 @@
+       zend_shutdown_constants(TSRMLS_C);
+ 
  #ifdef ZTS
 -      zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
+-
        zend_hash_destroy(GLOBAL_CONSTANTS_TABLE);
        free(GLOBAL_CONSTANTS_TABLE);
-       GLOBAL_FUNCTION_TABLE = NULL;
+