From 5335470004c0e97fd5f4d4a2d0371693cb26fccc Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Thu, 15 Jan 2015 17:09:32 +0100
Subject: removed <5.4 compatibility code

---
 log.c | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'log.c')

diff --git a/log.c b/log.c
index ed83c24..f76737c 100644
--- a/log.c
+++ b/log.c
@@ -287,11 +287,7 @@ log_sapi:
 	/* SAPI Logging activated? */
 	SDEBUG("(suhosin_log) log_syslog: %ld - log_sapi: %ld - log_script: %ld - log_phpscript: %ld", SUHOSIN_G(log_syslog), SUHOSIN_G(log_sapi), SUHOSIN_G(log_script), SUHOSIN_G(log_phpscript));
 	if (((SUHOSIN_G(log_sapi)|S_INTERNAL) & loglevel)!=0) {
-#if 0 //PHP_VERSION_ID < 50400
-		sapi_module.log_message(buf);
-#else
 		sapi_module.log_message(buf TSRMLS_CC);
-#endif
 	}
 	if ((SUHOSIN_G(log_stdout) & loglevel)!=0) {
 		fprintf(stdout, "%s\n", buf);
@@ -372,9 +368,6 @@ log_phpscript:
 		zval *result = NULL;
 		
 		long orig_execution_depth = SUHOSIN_G(execution_depth);
-#if 0 //PHP_VERSION_ID < 50400
-		zend_bool orig_safe_mode = PG(safe_mode);
-#endif
 		char *orig_basedir = PG(open_basedir);
 		
 		char *phpscript = SUHOSIN_G(log_phpscriptname);
@@ -411,18 +404,12 @@ SDEBUG("scriptname %s", SUHOSIN_G(log_phpscriptname));
 				
 				SUHOSIN_G(execution_depth) = 0;
 				if (SUHOSIN_G(log_phpscript_is_safe)) {
-#if 0 //PHP_VERSION_ID < 50400
-					PG(safe_mode) = 0;
-#endif
 					PG(open_basedir) = NULL;
 				}
 				
 				zend_execute(new_op_array TSRMLS_CC);
 				
 				SUHOSIN_G(execution_depth) = orig_execution_depth;
-#if 0 //PHP_VERSION_ID < 50400				
-				PG(safe_mode) = orig_safe_mode;
-#endif
 				PG(open_basedir) = orig_basedir;
 				
 #ifdef ZEND_ENGINE_2
-- 
cgit v1.3