[Pkg-php-commits] [php/debian-sid] remove debian patch check_ini_on_modify_status.patch

[Sean Finney]

fix incorporated upstream
---
 debian/patches/check_ini_on_modify_status.patch |   26 -----------------------
 debian/patches/series                           |    1 -
 2 files changed, 0 insertions(+), 27 deletions(-)
 delete mode 100644 debian/patches/check_ini_on_modify_status.patch

diff --git a/debian/patches/check_ini_on_modify_status.patch b/debian/patches/check_ini_on_modify_status.patch
deleted file mode 100644
index e433317..0000000
--- a/debian/patches/check_ini_on_modify_status.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: php/Zend/zend_ini.c
-===================================================================
---- php.orig/Zend/zend_ini.c
-+++ php/Zend/zend_ini.c
-@@ -46,15 +46,20 @@ static int zend_remove_ini_entries(zend_
- 
- static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS_DC) /* {{{ */
- {
-+	int result = FAILURE;
- 	if (ini_entry->modified) {
- 		if (ini_entry->on_modify) {
- 			zend_try {
- 			/* even if on_modify bails out, we have to continue on with restoring,
- 				since there can be allocated variables that would be freed on MM shutdown
- 				and would lead to memory corruption later ini entry is modified again */
--				ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
-+				result = ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
- 			} zend_end_try();
- 		}
-+		if(stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
-+			/* runtime failure is OK */
-+			return 1;
-+		}
- 		if (ini_entry->value != ini_entry->orig_value) {
- 			efree(ini_entry->value);
- 		}
diff --git a/debian/patches/series b/debian/patches/series
index ef7021b..53ad71a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,5 +40,4 @@ gentoo/009_ob-memory-leaks.patch
 mssql-null-exception.patch
 exif_read_data-segfault.patch
 sybase-alias.patch
-check_ini_on_modify_status.patch
 gentoo/117-4_digit_year_big_endian.patch
-- 
1.5.6.5