Use the TSRMLS_DC/TSRMLS_CC macros instead of TSRMLS_FETCH()

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 427c17f44d65bbf26d9b4e2962009f67e8d027b2..599f2ba4204fa5fc3e6eac6a3e6d13acffdf642c 100644 (file)
--- 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;
        }
 }

diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
index 53d66ea44cedd5825bb260ecbf0686245dbd6790..7e2963b6ac9a3c27c7df13e63d0b17ae3ff0c5a0 100644 (file)
--- a/sapi/cgi/fastcgi.c
+++ b/sapi/cgi/fastcgi.c
@@ -322,13 +322,13 @@ static char *fcgi_hash_get(fcgi_hash *h, char *var, unsigned int var_len, unsign
        return NULL;
 }
 
-static void fcgi_hash_apply(fcgi_hash *h, fcgi_apply_func func, void *arg)
+static void fcgi_hash_apply(fcgi_hash *h, fcgi_apply_func func, void *arg TSRMLS_DC)
 {
        fcgi_hash_bucket *p     = h->list;
 
        while (p) {
                if (EXPECTED(p->val != NULL)) {
-                       func(p->var, p->var_len, p->val, p->val_len, arg);
+                       func(p->var, p->var_len, p->val, p->val_len, arg TSRMLS_CC);
                }
                p = p->list_next;
        }
@@ -848,7 +848,7 @@ static int fcgi_get_params(fcgi_request *req, unsigned char *p, unsigned char *e
                        val_len |= *p++;
                }
                if (UNEXPECTED(name_len + val_len < 0) ||
-                   UNEXPECTED(name_len + val_len > end - p)) {
+                   UNEXPECTED((unsigned char *) (name_len + val_len) > end - p)) {
                        /* Malformated request */
                        ret = 0;
                        break;
@@ -1435,9 +1435,9 @@ char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val)
        return NULL;
 }
 
-void fcgi_loadenv(fcgi_request *req, fcgi_apply_func func, zval *array)
+void fcgi_loadenv(fcgi_request *req, fcgi_apply_func func, zval *array TSRMLS_DC)
 {
-       fcgi_hash_apply(&req->env, func, array);
+       fcgi_hash_apply(&req->env, func, array TSRMLS_CC);
 }
 
 #ifdef _WIN32

diff --git a/sapi/cgi/fastcgi.h b/sapi/cgi/fastcgi.h
index d708888c39623e989f642cd1598453b6a186b8b9..77277396b34f72cf95de406271889174a2ed414a 100644 (file)
--- a/sapi/cgi/fastcgi.h
+++ b/sapi/cgi/fastcgi.h
@@ -91,7 +91,7 @@ typedef struct _fcgi_end_request_rec {
 
 /* FastCGI client API */
 
-typedef void (*fcgi_apply_func)(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg);
+typedef void (*fcgi_apply_func)(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg TSRMLS_DC);
 
 typedef struct _fcgi_request fcgi_request;
 
@@ -107,7 +107,7 @@ int fcgi_finish_request(fcgi_request *req, int force_close);
 
 char* fcgi_getenv(fcgi_request *req, const char* var, int var_len);
 char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val);
-void  fcgi_loadenv(fcgi_request *req, fcgi_apply_func load_func, zval *array);
+void  fcgi_loadenv(fcgi_request *req, fcgi_apply_func load_func, zval *array TSRMLS_DC);
 
 int fcgi_read(fcgi_request *req, char *str, int len);