[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c branches/PHP_5_3/sapi/fpm/fpm/fpm_status.c branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c branches/PHP_5_4/sapi/fpm/fpm/fpm_status.c trunk/sapi/fpm/fpm/fpm_main.c trunk/sapi/fpm/fpm/fpm_status.c

[Felipe Pena]

felipe                                   Sat, 18 Jun 2011 17:41:56 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=312262

Log:
- Fixed ZTS build

Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_status.c
    U   php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c
    U   php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_status.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_status.c

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c        2011-06-18 
16:27:48 UTC (rev 312261)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c        2011-06-18 
17:41:56 UTC (rev 312262)
@@ -1854,7 +1854,7 @@
                                goto fastcgi_request_done;
                        }

-                       if (fpm_status_handle_request()) {
+                       if (fpm_status_handle_request(TSRMLS_C)) {
                                goto fastcgi_request_done;
                        }


Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_status.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_status.c      2011-06-18 
16:27:48 UTC (rev 312261)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_status.c      2011-06-18 
17:41:56 UTC (rev 312262)
@@ -160,7 +160,7 @@
 }
 /* }}} */

-int fpm_status_handle_request() /* {{{ */
+int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 {
        struct fpm_status_s status;
        char *buffer, *syntax;

Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c        2011-06-18 
16:27:48 UTC (rev 312261)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c        2011-06-18 
17:41:56 UTC (rev 312262)
@@ -1853,7 +1853,7 @@
                                goto fastcgi_request_done;
                        }

-                       if (fpm_status_handle_request()) {
+                       if (fpm_status_handle_request(TSRMLS_C)) {
                                goto fastcgi_request_done;
                        }


Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_status.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_status.c      2011-06-18 
16:27:48 UTC (rev 312261)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_status.c      2011-06-18 
17:41:56 UTC (rev 312262)
@@ -160,7 +160,7 @@
 }
 /* }}} */

-int fpm_status_handle_request() /* {{{ */
+int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 {
        struct fpm_status_s status;
        char *buffer, *syntax;

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-06-18 16:27:48 UTC (rev 
312261)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-06-18 17:41:56 UTC (rev 
312262)
@@ -1853,7 +1853,7 @@
                                goto fastcgi_request_done;
                        }

-                       if (fpm_status_handle_request()) {
+                       if (fpm_status_handle_request(TSRMLS_C)) {
                                goto fastcgi_request_done;
                        }


Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_status.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_status.c 2011-06-18 16:27:48 UTC (rev 
312261)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_status.c 2011-06-18 17:41:56 UTC (rev 
312262)
@@ -160,7 +160,7 @@
 }
 /* }}} */

-int fpm_status_handle_request() /* {{{ */
+int fpm_status_handle_request(TSRMLS_D) /* {{{ */
 {
        struct fpm_status_s status;
        char *buffer, *syntax;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php