Fixed ZTS build

dstogov · dstogov · commit d6e772a1d004 · 2010-08-18T11:59:30.000Z
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
@@ -590,9 +590,11 @@ static char *sapi_cgi_read_cookies(TSRMLS_D)
 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -590,9 +590,11 @@ static char *sapi_cgi_read_cookies(TSRMLS_D)`
`590`	`590`	`static void cgi_php_load_env_var(char var, unsigned int var_len, char val, unsigned int val_len, void *arg)`
`591`	`591`	`{`
`592`	`592`	`zval array_ptr = (zval)arg;`
`593`		`- int filter_arg = (array_ptr == PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER;`
	`593`	`+ int filter_arg;`
`594`	`594`	`unsigned int new_val_len;`
	`595`	`+ TSRMLS_FETCH();`
`595`	`596`
	`597`	`+ filter_arg = (array_ptr == PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER;`
`596`	`598`	`if (sapi_module.input_filter(filter_arg, var, &val, strlen(val), &new_val_len TSRMLS_CC)) {`
`597`	`599`	`php_register_variable_safe(var, val, new_val_len, array_ptr TSRMLS_CC);`
`598`	`600`	`}`