summaryrefslogtreecommitdiff
path: root/execute.c
diff options
context:
space:
mode:
Diffstat (limited to 'execute.c')
-rw-r--r--execute.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/execute.c b/execute.c
index aa37fb9..37abdfd 100644
--- a/execute.c
+++ b/execute.c
@@ -859,7 +859,8 @@ int ih_mail(IH_HANDLER_PARAMS)
859 859
860int ih_querycheck(IH_HANDLER_PARAMS) 860int ih_querycheck(IH_HANDLER_PARAMS)
861{ 861{
862#ifdef PHP_ATLEAST_5_3 862// #ifdef PHP_ATLEAST_5_3
863#if 1
863 void **p = zend_vm_stack_top(TSRMLS_C) - 1; 864 void **p = zend_vm_stack_top(TSRMLS_C) - 1;
864#else 865#else
865 void **p = EG(argument_stack).top_element-2; 866 void **p = EG(argument_stack).top_element-2;
@@ -1020,7 +1021,8 @@ int ih_querycheck(IH_HANDLER_PARAMS)
1020 1021
1021int ih_fixusername(IH_HANDLER_PARAMS) 1022int ih_fixusername(IH_HANDLER_PARAMS)
1022{ 1023{
1023#ifdef PHP_ATLEAST_5_3 1024// #ifdef PHP_ATLEAST_5_3
1025#if 1
1024 void **p = zend_vm_stack_top(TSRMLS_C) - 1; 1026 void **p = zend_vm_stack_top(TSRMLS_C) - 1;
1025#else 1027#else
1026 void **p = EG(argument_stack).top_element-2; 1028 void **p = EG(argument_stack).top_element-2;
@@ -1115,7 +1117,8 @@ int ih_fixusername(IH_HANDLER_PARAMS)
1115 1117
1116static int ih_function_exists(IH_HANDLER_PARAMS) 1118static int ih_function_exists(IH_HANDLER_PARAMS)
1117{ 1119{
1118#ifndef PHP_ATLEAST_5_3 1120// #ifndef PHP_ATLEAST_5_3
1121#if 1
1119 zval **function_name; 1122 zval **function_name;
1120#endif 1123#endif
1121 zend_function *func; 1124 zend_function *func;
@@ -1123,7 +1126,8 @@ static int ih_function_exists(IH_HANDLER_PARAMS)
1123 zend_bool retval; 1126 zend_bool retval;
1124 int func_name_len; 1127 int func_name_len;
1125 1128
1126#ifndef PHP_ATLEAST_5_3 1129// #ifndef PHP_ATLEAST_5_3
1130#if 1
1127 if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &function_name)==FAILURE) { 1131 if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &function_name)==FAILURE) {
1128 ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(1); 1132 ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(1);
1129 } 1133 }
@@ -1559,7 +1563,8 @@ static int ih_rand(IH_HANDLER_PARAMS)
1559 1563
1560static int ih_getrandmax(IH_HANDLER_PARAMS) 1564static int ih_getrandmax(IH_HANDLER_PARAMS)
1561{ 1565{
1562#ifdef PHP_ATLEAST_5_3 1566// #ifdef PHP_ATLEAST_5_3
1567#if 1
1563 if (zend_parse_parameters_none() == FAILURE) { 1568 if (zend_parse_parameters_none() == FAILURE) {
1564 return(0); 1569 return(0);
1565 } 1570 }
@@ -1737,7 +1742,7 @@ static void suhosin_execute_internal(zend_execute_data *execute_data_ptr, int re
1737 1742
1738#if PHP_VERSION_ID < 50500 1743#if PHP_VERSION_ID < 50500
1739#ifdef ZEND_ENGINE_2 1744#ifdef ZEND_ENGINE_2
1740# if PHP_VERSION_ID < 50400 1745# if 0 // PHP_VERSION_ID < 50400
1741 return_value = (*(temp_variable *)((char *) execute_data_ptr->Ts + execute_data_ptr->opline->result.u.var)).var.ptr; 1746 return_value = (*(temp_variable *)((char *) execute_data_ptr->Ts + execute_data_ptr->opline->result.u.var)).var.ptr;
1742# else 1747# else
1743 return_value = (*(temp_variable *)((char *) execute_data_ptr->Ts + execute_data_ptr->opline->result.var)).var.ptr; 1748 return_value = (*(temp_variable *)((char *) execute_data_ptr->Ts + execute_data_ptr->opline->result.var)).var.ptr;