[Pkg-php-commits] [php/debian-experimental] Update strcmp_null-OnUpdateErrorLog.patch; merged upstream, leave a patch with a test case

[Ondřej Surý]

---
 debian/patches/strcmp_null-OnUpdateErrorLog.patch |   18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/debian/patches/strcmp_null-OnUpdateErrorLog.patch b/debian/patches/strcmp_null-OnUpdateErrorLog.patch
index cd1c872..6d93023 100644
--- a/debian/patches/strcmp_null-OnUpdateErrorLog.patch
+++ b/debian/patches/strcmp_null-OnUpdateErrorLog.patch
@@ -1,21 +1,5 @@
-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
++++ b/tests/func/null-new_val.phpt
 @@ -0,0 +1,10 @@
 +--TEST--
 +ini_restore strcmp NULL new_val
-- 
1.6.3.3