summaryrefslogtreecommitdiff
path: root/treat_data.c
diff options
context:
space:
mode:
authorBen Fuhrmannek2015-01-22 15:21:51 +0100
committerBen Fuhrmannek2015-01-22 15:21:51 +0100
commit784331fc2217f9084a57be7cb0e153532453fefd (patch)
treef666e0196eff97fcf2c98d6c7a2363dc5a638b06 /treat_data.c
parent432e8f9ab8a3029b16e03676aa643f3788faf14c (diff)
removed even more #ifdef ZEND_ENGINE_2
Diffstat (limited to 'treat_data.c')
-rw-r--r--treat_data.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/treat_data.c b/treat_data.c
index 10e8166..aa645be 100644
--- a/treat_data.c
+++ b/treat_data.c
@@ -160,13 +160,9 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
160 val_len = php_url_decode(val, strlen(val)); 160 val_len = php_url_decode(val, strlen(val));
161 val = estrndup(val, val_len); 161 val = estrndup(val, val_len);
162 if (suhosin_input_filter(arg, var, &val, val_len, &new_val_len TSRMLS_CC)) { 162 if (suhosin_input_filter(arg, var, &val, val_len, &new_val_len TSRMLS_CC)) {
163#ifdef ZEND_ENGINE_2
164 if (sapi_module.input_filter(arg, var, &val, new_val_len, &new_val_len TSRMLS_CC)) { 163 if (sapi_module.input_filter(arg, var, &val, new_val_len, &new_val_len TSRMLS_CC)) {
165#endif
166 php_register_variable_safe(var, val, new_val_len, array_ptr TSRMLS_CC); 164 php_register_variable_safe(var, val, new_val_len, array_ptr TSRMLS_CC);
167#ifdef ZEND_ENGINE_2
168 } 165 }
169#endif
170 } else { 166 } else {
171 SUHOSIN_G(abort_request) = 1; 167 SUHOSIN_G(abort_request) = 1;
172 } 168 }
@@ -179,13 +175,9 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
179 val_len = 0; 175 val_len = 0;
180 val = estrndup("", val_len); 176 val = estrndup("", val_len);
181 if (suhosin_input_filter(arg, var, &val, val_len, &new_val_len TSRMLS_CC)) { 177 if (suhosin_input_filter(arg, var, &val, val_len, &new_val_len TSRMLS_CC)) {
182#ifdef ZEND_ENGINE_2
183 if (sapi_module.input_filter(arg, var, &val, new_val_len, &new_val_len TSRMLS_CC)) { 178 if (sapi_module.input_filter(arg, var, &val, new_val_len, &new_val_len TSRMLS_CC)) {
184#endif
185 php_register_variable_safe(var, val, new_val_len, array_ptr TSRMLS_CC); 179 php_register_variable_safe(var, val, new_val_len, array_ptr TSRMLS_CC);
186#ifdef ZEND_ENGINE_2
187 } 180 }
188#endif
189 } else { 181 } else {
190 SUHOSIN_G(abort_request) = 1; 182 SUHOSIN_G(abort_request) = 1;
191 } 183 }
@@ -209,12 +201,11 @@ void suhosin_hook_treat_data()
209 TSRMLS_FETCH(); 201 TSRMLS_FETCH();
210 202
211 sapi_register_treat_data(suhosin_treat_data TSRMLS_CC); 203 sapi_register_treat_data(suhosin_treat_data TSRMLS_CC);
212#ifdef ZEND_ENGINE_2 204
213 if (old_input_filter == NULL) { 205 if (old_input_filter == NULL) {
214 old_input_filter = sapi_module.input_filter; 206 old_input_filter = sapi_module.input_filter;
215 } 207 }
216 sapi_module.input_filter = suhosin_input_filter_wrapper; 208 sapi_module.input_filter = suhosin_input_filter_wrapper;
217#endif
218} 209}
219 210
220 211