diff options
| author | Ben Fuhrmannek | 2015-01-15 17:09:32 +0100 |
|---|---|---|
| committer | Ben Fuhrmannek | 2015-01-15 17:09:32 +0100 |
| commit | 5335470004c0e97fd5f4d4a2d0371693cb26fccc (patch) | |
| tree | b058967648f7069b5f43a1c23a7c7b8f56460959 /treat_data.c | |
| parent | 68960966324f4701a1f402e97f17ca7870a317a4 (diff) | |
removed <5.4 compatibility code
Diffstat (limited to 'treat_data.c')
| -rw-r--r-- | treat_data.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/treat_data.c b/treat_data.c index 9dc86d1..10e8166 100644 --- a/treat_data.c +++ b/treat_data.c | |||
| @@ -39,9 +39,7 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data) | |||
| 39 | int free_buffer = 0; | 39 | int free_buffer = 0; |
| 40 | char *strtok_buf = NULL; | 40 | char *strtok_buf = NULL; |
| 41 | 41 | ||
| 42 | #if 1 //PHP_VERSION_ID >= 50311 | ||
| 43 | long count = 0; | 42 | long count = 0; |
| 44 | #endif | ||
| 45 | 43 | ||
| 46 | /* Mark that we were not yet called */ | 44 | /* Mark that we were not yet called */ |
| 47 | SUHOSIN_G(already_scanned) = 0; | 45 | SUHOSIN_G(already_scanned) = 0; |
| @@ -148,12 +146,10 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data) | |||
| 148 | } | 146 | } |
| 149 | val = strchr(var, '='); | 147 | val = strchr(var, '='); |
| 150 | 148 | ||
| 151 | #if 1 //PHP_VERSION_ID >= 50311 | ||
| 152 | if (++count > PG(max_input_vars)) { | 149 | if (++count > PG(max_input_vars)) { |
| 153 | php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); | 150 | php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); |
| 154 | break; | 151 | break; |
| 155 | } | 152 | } |
| 156 | #endif | ||
| 157 | 153 | ||
| 158 | if (val) { /* have a value */ | 154 | if (val) { /* have a value */ |
| 159 | int val_len; | 155 | int val_len; |
| @@ -210,13 +206,9 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data) | |||
| 210 | 206 | ||
| 211 | void suhosin_hook_treat_data() | 207 | void suhosin_hook_treat_data() |
| 212 | { | 208 | { |
| 213 | #if 0 //PHP_VERSION_ID < 50400 | ||
| 214 | sapi_register_treat_data(suhosin_treat_data); | ||
| 215 | #else | ||
| 216 | TSRMLS_FETCH(); | 209 | TSRMLS_FETCH(); |
| 217 | 210 | ||
| 218 | sapi_register_treat_data(suhosin_treat_data TSRMLS_CC); | 211 | sapi_register_treat_data(suhosin_treat_data TSRMLS_CC); |
| 219 | #endif | ||
| 220 | #ifdef ZEND_ENGINE_2 | 212 | #ifdef ZEND_ENGINE_2 |
| 221 | if (old_input_filter == NULL) { | 213 | if (old_input_filter == NULL) { |
| 222 | old_input_filter = sapi_module.input_filter; | 214 | old_input_filter = sapi_module.input_filter; |
