summaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
authorBen Fuhrmannek2015-01-15 17:09:32 +0100
committerBen Fuhrmannek2015-01-15 17:09:32 +0100
commit5335470004c0e97fd5f4d4a2d0371693cb26fccc (patch)
treeb058967648f7069b5f43a1c23a7c7b8f56460959 /log.c
parent68960966324f4701a1f402e97f17ca7870a317a4 (diff)
removed <5.4 compatibility code
Diffstat (limited to '')
-rw-r--r--log.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/log.c b/log.c
index ed83c24..f76737c 100644
--- a/log.c
+++ b/log.c
@@ -287,11 +287,7 @@ log_sapi:
287 /* SAPI Logging activated? */ 287 /* SAPI Logging activated? */
288 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)); 288 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));
289 if (((SUHOSIN_G(log_sapi)|S_INTERNAL) & loglevel)!=0) { 289 if (((SUHOSIN_G(log_sapi)|S_INTERNAL) & loglevel)!=0) {
290#if 0 //PHP_VERSION_ID < 50400
291 sapi_module.log_message(buf);
292#else
293 sapi_module.log_message(buf TSRMLS_CC); 290 sapi_module.log_message(buf TSRMLS_CC);
294#endif
295 } 291 }
296 if ((SUHOSIN_G(log_stdout) & loglevel)!=0) { 292 if ((SUHOSIN_G(log_stdout) & loglevel)!=0) {
297 fprintf(stdout, "%s\n", buf); 293 fprintf(stdout, "%s\n", buf);
@@ -372,9 +368,6 @@ log_phpscript:
372 zval *result = NULL; 368 zval *result = NULL;
373 369
374 long orig_execution_depth = SUHOSIN_G(execution_depth); 370 long orig_execution_depth = SUHOSIN_G(execution_depth);
375#if 0 //PHP_VERSION_ID < 50400
376 zend_bool orig_safe_mode = PG(safe_mode);
377#endif
378 char *orig_basedir = PG(open_basedir); 371 char *orig_basedir = PG(open_basedir);
379 372
380 char *phpscript = SUHOSIN_G(log_phpscriptname); 373 char *phpscript = SUHOSIN_G(log_phpscriptname);
@@ -411,18 +404,12 @@ SDEBUG("scriptname %s", SUHOSIN_G(log_phpscriptname));
411 404
412 SUHOSIN_G(execution_depth) = 0; 405 SUHOSIN_G(execution_depth) = 0;
413 if (SUHOSIN_G(log_phpscript_is_safe)) { 406 if (SUHOSIN_G(log_phpscript_is_safe)) {
414#if 0 //PHP_VERSION_ID < 50400
415 PG(safe_mode) = 0;
416#endif
417 PG(open_basedir) = NULL; 407 PG(open_basedir) = NULL;
418 } 408 }
419 409
420 zend_execute(new_op_array TSRMLS_CC); 410 zend_execute(new_op_array TSRMLS_CC);
421 411
422 SUHOSIN_G(execution_depth) = orig_execution_depth; 412 SUHOSIN_G(execution_depth) = orig_execution_depth;
423#if 0 //PHP_VERSION_ID < 50400
424 PG(safe_mode) = orig_safe_mode;
425#endif
426 PG(open_basedir) = orig_basedir; 413 PG(open_basedir) = orig_basedir;
427 414
428#ifdef ZEND_ENGINE_2 415#ifdef ZEND_ENGINE_2