svn: /php/php-src/trunk/sapi/cgi/ cgi_main.c
| From: | Dmitry Stogov | Date: | Wed, 18 Aug 2010 11:59:30 +0000 |
| Subject: | svn: /php/php-src/trunk/sapi/cgi/ cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63324@lists.php.net to get a copy of this message | ||
dmitry Wed, 18 Aug 2010 11:59:30 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302437
Log:
Fixed ZTS build
Changed paths:
U php/php-src/trunk/sapi/cgi/cgi_main.c
Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===================================================================
--- php/php-src/trunk/sapi/cgi/cgi_main.c 2010-08-18 11:58:53 UTC (rev 302436)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c 2010-08-18 11:59:30 UTC (rev 302437)
@@ -590,9 +590,11 @@
static void cgi_php_load_env_var(char *var, unsigned int var_len, char *val, unsigned int val_len,
void *arg)
{
zval *array_ptr = (zval*)arg;
- int filter_arg = (array_ptr == PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER;
+ int filter_arg;
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);
}