diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-08-18 12:59:52 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-08-18 12:59:52 +0000 |
| commit | 65d031d3da891ce12ddf41ffe676f16d0ac3db4e (patch) | |
| tree | fca478e738189aef9d62a184662c62730c98bd2c /sapi/cgi/cgi_main.c | |
| parent | d6e772a1d00463f309fa0f34add2ebe107520797 (diff) | |
| download | php-git-65d031d3da891ce12ddf41ffe676f16d0ac3db4e.tar.gz | |
Use the TSRMLS_DC/TSRMLS_CC macros instead of TSRMLS_FETCH()
Diffstat (limited to 'sapi/cgi/cgi_main.c')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 427c17f44d..599f2ba420 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -587,14 +587,12 @@ static char *sapi_cgi_read_cookies(TSRMLS_D) return sapi_cgibin_getenv((char *) "HTTP_COOKIE", sizeof("HTTP_COOKIE")-1 TSRMLS_CC); } -static void cgi_php_load_env_var(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) +static void cgi_php_load_env_var(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg TSRMLS_DC) { zval *array_ptr = (zval*)arg; - int filter_arg; + int filter_arg = (array_ptr == PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER; unsigned int new_val_len; - TSRMLS_FETCH(); - filter_arg = (array_ptr == PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER; if (sapi_module.input_filter(filter_arg, var, &val, strlen(val), &new_val_len TSRMLS_CC)) { php_register_variable_safe(var, val, new_val_len, array_ptr TSRMLS_CC); } @@ -633,7 +631,7 @@ void cgi_php_import_environment_variables(zval *array_ptr TSRMLS_DC) /* turn off magic_quotes while importing environment variables */ PG(magic_quotes_gpc) = 0; - fcgi_loadenv(request, cgi_php_load_env_var, array_ptr); + fcgi_loadenv(request, cgi_php_load_env_var, array_ptr TSRMLS_CC); PG(magic_quotes_gpc) = magic_quotes_gpc; } } |