summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sapi/caudium/caudium.c4
-rw-r--r--sapi/fastcgi/fastcgi.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index bab0e35734..1a357b84d4 100644
--- a/sapi/caudium/caudium.c
+++ b/sapi/caudium/caudium.c
@@ -520,9 +520,9 @@ INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array TS
}
-static void sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC)
+static void sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC)
{
- THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array TSRMLS_CC TSRMLS_CC TSRMLS_CC), "register_variables");
+ THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array TSRMLS_CC), "register_variables");
}
/* this structure is static (as in "it does not change") */
diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index fa939a8aed..6ad0bbec18 100644
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -140,7 +140,7 @@ static char *sapi_fastcgi_read_cookies(TSRMLS_D)
}
-static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC)
+static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC)
{
char *self = getenv("REQUEST_URI");
char *ptr = strchr( self, '?' );
@@ -192,10 +192,9 @@ static sapi_module_struct fastcgi_sapi_module = {
STANDARD_SAPI_MODULE_PROPERTIES
};
-static void fastcgi_module_main(TSRMLS_D TSRMLS_DC)
+static void fastcgi_module_main(TSRMLS_D)
{
zend_file_handle file_handle;
- TSRMLS_FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.filename = SG(request_info).path_translated;