summaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
authorBen Fuhrmannek2015-01-22 12:19:09 +0100
committerBen Fuhrmannek2015-01-22 12:19:09 +0100
commit432e8f9ab8a3029b16e03676aa643f3788faf14c (patch)
tree27e99ec0af706b4820c4d9472a01dff4c4bea5eb /log.c
parent8affcacdbeba5fd95e1b26a6bcfc9c3030a1d893 (diff)
removed #ifdef ZEND_ENGINE_2 as it is always defined anyway
Diffstat (limited to 'log.c')
-rw-r--r--log.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/log.c b/log.c
index f76737c..b819eca 100644
--- a/log.c
+++ b/log.c
@@ -372,13 +372,7 @@ log_phpscript:
372 372
373 char *phpscript = SUHOSIN_G(log_phpscriptname); 373 char *phpscript = SUHOSIN_G(log_phpscriptname);
374SDEBUG("scriptname %s", SUHOSIN_G(log_phpscriptname)); 374SDEBUG("scriptname %s", SUHOSIN_G(log_phpscriptname));
375#ifdef ZEND_ENGINE_2
376 if (zend_stream_open(phpscript, &file_handle TSRMLS_CC) == SUCCESS) { 375 if (zend_stream_open(phpscript, &file_handle TSRMLS_CC) == SUCCESS) {
377#else
378 if (zend_open(phpscript, &file_handle) == SUCCESS && ZEND_IS_VALID_FILE_HANDLE(&file_handle)) {
379 file_handle.filename = phpscript;
380 file_handle.free_filename = 0;
381#endif
382 if (!file_handle.opened_path) { 376 if (!file_handle.opened_path) {
383 file_handle.opened_path = estrndup(phpscript, strlen(phpscript)); 377 file_handle.opened_path = estrndup(phpscript, strlen(phpscript));
384 } 378 }
@@ -412,15 +406,10 @@ SDEBUG("scriptname %s", SUHOSIN_G(log_phpscriptname));
412 SUHOSIN_G(execution_depth) = orig_execution_depth; 406 SUHOSIN_G(execution_depth) = orig_execution_depth;
413 PG(open_basedir) = orig_basedir; 407 PG(open_basedir) = orig_basedir;
414 408
415#ifdef ZEND_ENGINE_2
416 destroy_op_array(new_op_array TSRMLS_CC); 409 destroy_op_array(new_op_array TSRMLS_CC);
417#else
418 destroy_op_array(new_op_array);
419#endif
420 efree(new_op_array); 410 efree(new_op_array);
421#ifdef ZEND_ENGINE_2 411
422 if (!EG(exception)) 412 if (!EG(exception))
423#endif
424 { 413 {
425 if (EG(return_value_ptr_ptr)) { 414 if (EG(return_value_ptr_ptr)) {
426 zval_ptr_dtor(EG(return_value_ptr_ptr)); 415 zval_ptr_dtor(EG(return_value_ptr_ptr));