diff options
| author | Ben Fuhrmannek | 2014-12-18 12:06:55 +0100 |
|---|---|---|
| committer | Ben Fuhrmannek | 2014-12-18 12:06:55 +0100 |
| commit | 68960966324f4701a1f402e97f17ca7870a317a4 (patch) | |
| tree | 5a3c4c7deb4c1805d4a006a7e2cd441abf693286 /ex_imp.c | |
| parent | 59dab711ba444a16fc5f7114d628749e1818e303 (diff) | |
removed compatibility to PHP version < 5.4 (by ifdef)
Diffstat (limited to 'ex_imp.c')
| -rw-r--r-- | ex_imp.c | 8 |
1 files changed, 4 insertions, 4 deletions
| @@ -86,7 +86,7 @@ static int php_valid_var_name(char *var_name, int len) /* {{{ */ | |||
| 86 | Imports variables into symbol table from an array */ | 86 | Imports variables into symbol table from an array */ |
| 87 | PHP_FUNCTION(suhosin_extract) | 87 | PHP_FUNCTION(suhosin_extract) |
| 88 | { | 88 | { |
| 89 | #if PHP_VERSION_ID >= 50300 | 89 | #if 1 //PHP_VERSION_ID >= 50300 |
| 90 | zval *var_array, *prefix = NULL; | 90 | zval *var_array, *prefix = NULL; |
| 91 | long extract_type = EXTR_OVERWRITE; | 91 | long extract_type = EXTR_OVERWRITE; |
| 92 | zval **entry, *data; | 92 | zval **entry, *data; |
| @@ -422,14 +422,14 @@ PHP_FUNCTION(suhosin_extract) | |||
| 422 | 422 | ||
| 423 | 423 | ||
| 424 | 424 | ||
| 425 | #if PHP_VERSION_ID < 50400 | 425 | #if 0 //PHP_VERSION_ID < 50400 |
| 426 | /* import_request_variables() has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0. */ | 426 | /* import_request_variables() has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0. */ |
| 427 | #define SUHOSIN_HAVE_IRV 1 | 427 | #define SUHOSIN_HAVE_IRV 1 |
| 428 | #endif | 428 | #endif |
| 429 | 429 | ||
| 430 | #ifdef SUHOSIN_HAVE_IRV | 430 | #ifdef SUHOSIN_HAVE_IRV |
| 431 | 431 | ||
| 432 | #if PHP_VERSION_ID >= 50300 | 432 | #if 1 //PHP_VERSION_ID >= 50300 |
| 433 | static int copy_request_variable(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) | 433 | static int copy_request_variable(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) |
| 434 | { | 434 | { |
| 435 | zval *prefix, new_key; | 435 | zval *prefix, new_key; |
| @@ -527,7 +527,7 @@ static int copy_request_variable(void *pDest, int num_args, va_list args, zend_h | |||
| 527 | Import GET/POST/Cookie variables into the global scope */ | 527 | Import GET/POST/Cookie variables into the global scope */ |
| 528 | PHP_FUNCTION(suhosin_import_request_variables) | 528 | PHP_FUNCTION(suhosin_import_request_variables) |
| 529 | { | 529 | { |
| 530 | #if PHP_VERSION_ID >= 50300 | 530 | #if 1 //PHP_VERSION_ID >= 50300 |
| 531 | char *types; | 531 | char *types; |
| 532 | int types_len; | 532 | int types_len; |
| 533 | zval *prefix = NULL; | 533 | zval *prefix = NULL; |
