Patch conditional-safe-mode.diff for dbase Bug #61622

Patch version 2012-06-16 12:29 UTC

Obsolete patches:

• remove-safe-mode.diff, revision 2012-04-10 12:11 UTC

• 2012-06-16 12:29 UTC [diff to current]

Developer: jille@hexon.cx

--- dbase.c	2012-06-16 14:24:16.000000000 +0200
+++ dbase.c	2012-06-16 14:25:53.000000000 +0200
@@ -23,7 +23,9 @@
 #endif
 
 #include "php.h"
+#if PHP_VERSION_ID < 50400
 #include "safe_mode.h"
+#endif /* PHP_VERSION_ID < 50400 */
 #include "fopen_wrappers.h"
 #include "php_globals.h"
 
@@ -142,10 +144,12 @@
 		RETURN_FALSE;
 	}
 
+#if PHP_VERSION_ID < 50400
 	if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(dbf_name), NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
 		RETURN_FALSE;
 	}
 	
+#endif /* PHP_VERSION_ID < 50400 */
 	if (php_check_open_basedir(Z_STRVAL_PP(dbf_name) TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
@@ -604,9 +608,11 @@
 		RETURN_FALSE;
 	}
 
+#if PHP_VERSION_ID < 50400
 	if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(filename), NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
 		RETURN_FALSE;
 	}
+#endif /* PHP_VERSION_ID < 50400 */
 	
 	if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
 		RETURN_FALSE;