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

[Sean Finney]

fix incorporated upstream
---
 debian/patches/series                             |    1 -
 debian/patches/strcmp_null-OnUpdateErrorLog.patch |   29 ---------------------
 2 files changed, 0 insertions(+), 30 deletions(-)
 delete mode 100644 debian/patches/strcmp_null-OnUpdateErrorLog.patch

diff --git a/debian/patches/series b/debian/patches/series
index f9b7c08..ef7021b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,6 +40,5 @@ gentoo/009_ob-memory-leaks.patch
 mssql-null-exception.patch
 exif_read_data-segfault.patch
 sybase-alias.patch
-strcmp_null-OnUpdateErrorLog.patch
 check_ini_on_modify_status.patch
 gentoo/117-4_digit_year_big_endian.patch
diff --git a/debian/patches/strcmp_null-OnUpdateErrorLog.patch b/debian/patches/strcmp_null-OnUpdateErrorLog.patch
deleted file mode 100644
index cd1c872..0000000
--- a/debian/patches/strcmp_null-OnUpdateErrorLog.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: php/main/main.c
-===================================================================
---- php.orig/main/main.c
-+++ php/main/main.c
-@@ -312,8 +312,7 @@ static PHP_INI_DISP(display_errors_mode)
- static PHP_INI_MH(OnUpdateErrorLog)
- {
- 	/* Only do the safemode/open_basedir check at runtime */
--	if ((stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) &&
--		strcmp(new_value, "syslog")) {
-+	if ((stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) && new_value && strcmp(new_value, "syslog")) {
- 		if (PG(safe_mode) && (!php_checkuid(new_value, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
- 			return FAILURE;
- 		}
-Index: php/tests/func/null-new_val.phpt
-===================================================================
---- /dev/null
-+++ php/tests/func/null-new_val.phpt
-@@ -0,0 +1,10 @@
-+--TEST--
-+ini_restore strcmp NULL new_val
-+--FILE--
-+<?php
-+
-+ini_set('error_log','ini_set_works');
-+ini_restore('error_log');
-+
-+?>
-+--EXPECT--
-- 
1.5.6.5