Remove more duplicate TSRMLS_FETCH() calls.

diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index 135c2428967ce9520ef7fb64c43672073b87dc54..bab0e35734131f711e3836fc6657efc7a820d7a5 100644 (file)
--- a/sapi/caudium/caudium.c
+++ b/sapi/caudium/caudium.c
@@ -612,8 +612,6 @@ static void php_caudium_module_main(php_caudium_request *ureq)
   struct thread_state *state;
   extern struct program *thread_id_prog;
 #endif
-  TSRMLS_FETCH();
-  TSRMLS_FETCH();
   TSRMLS_FETCH();
   GET_THIS();
   THIS->filename = ureq->filename;

diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index 382d148807b501d627693c72fb7f31bdcc487ac0..fa939a8aed6732915b232a904001396800e06437 100644 (file)
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -196,7 +196,6 @@ static void fastcgi_module_main(TSRMLS_D TSRMLS_DC)
 {
        zend_file_handle file_handle;
        TSRMLS_FETCH();
-       TSRMLS_FETCH();
 
        file_handle.type = ZEND_HANDLE_FILENAME;
        file_handle.filename = SG(request_info).path_translated;

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 0ed677a96d2efb5bfcdeb4f6f8caeb02bd943972..e7633f07b61d0ffc1591f0473f6e5dbd37ac3f7d 100644 (file)
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -448,7 +448,6 @@ nsapi_module_main(NSLS_D SLS_DC)
        int result;
        zend_file_handle file_handle;
        TSRMLS_FETCH();
-       TSRMLS_FETCH();
 
        if (php_request_startup(TSRMLS_C) == FAILURE) {
                return FAILURE;

diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
index cb3b524723b597698b5e4abfcb156b4325992ba0..c3aec39e9312d1eb9168f2e146343b922e7190cb 100644 (file)
--- a/sapi/phttpd/phttpd.c
+++ b/sapi/phttpd/phttpd.c
@@ -255,7 +255,6 @@ int php_doit(TSRMLS_D TSRMLS_DC)
        zend_file_handle file_handle;
        struct httpinfo *hip = PHG(cip)->hip;
        TSRMLS_FETCH();
-       TSRMLS_FETCH();
 
        if (php_request_startup(TSRMLS_C) == FAILURE) {
         return -1;

diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index 3a52e14cd23d82685d0ddc71c27aa702e019dc1f..99f48d2be16f4971d1844837c2fd595cd96b618e 100644 (file)
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -378,8 +378,6 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
        char *header_line;
        int iRet = PIAPI_COMPLETED;
        TSRMLS_FETCH();
-       TSRMLS_FETCH();
-       TSRMLS_FETCH();
 
        zend_try {
                file_handle.filename = lpCB->lpszFileName;

diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 09ea71c4d3bfd3af8dd494c6d3d0d2a16db5c76a..c670d6b6bb2c9a7d6257b43af8b876196c827786 100644 (file)
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -585,7 +585,6 @@ static int php_roxen_module_main(TSRMLS_D)
   zend_file_handle file_handle;
 #ifdef ZTS
   TSRMLS_FETCH();
-  TSRMLS_FETCH();
 #ifdef ROXEN_USE_ZTS
   GET_THIS();
 #endif

diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index f12e50a79ae340f24c99a67397e7187efddb5bd0..5da9d6eeef8cc5e59b772a7406c6c58d5ab55c0b 100644 (file)
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -262,7 +262,6 @@ static void thttpd_module_main(TSRMLS_D TSRMLS_DC)
 {
        zend_file_handle file_handle;
        TSRMLS_FETCH();
-       TSRMLS_FETCH();
 
        file_handle.type = ZEND_HANDLE_FILENAME;
        file_handle.filename = SG(request_info).path_translated;
@@ -446,7 +445,6 @@ static void *worker_thread(void *dummy)
        int do_work = 50;
        httpd_conn *hc;
        TSRMLS_FETCH();
-       TSRMLS_FETCH();
 
        while (do_work) {
                hc = dequeue_request();
@@ -518,7 +516,6 @@ off_t thttpd_php_request(httpd_conn *hc)
 #ifdef ZTS
        queue_request(hc);
 #else
-       TSRMLS_FETCH();
        TSRMLS_FETCH();
        return thttpd_real_php_request(hc TSRMLS_CC TSRMLS_CC);
 #endif