diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2003-03-25 08:07:13 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2003-03-25 08:07:13 +0000 |
| commit | 5ca078779a7cde0f3a4a9b0cc8b77abd5177a1d7 (patch) | |
| tree | 4aed82d43faf1aa9cf1f7080dcc1e0197542e9d3 /sapi | |
| parent | b671380b6b5b6e1f4f235e810afa4199e989d2ba (diff) | |
| download | php-git-5ca078779a7cde0f3a4a9b0cc8b77abd5177a1d7.tar.gz | |
Eliminate some TSRMLS_FETCH() calls. Tested with Win32 build of SAPI/CGI and SAPI/CLI on Win32.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/php_apache.c | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 2 | ||||
| -rw-r--r-- | sapi/apache_hooks/php_apache.c | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 4 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 4 | ||||
| -rw-r--r-- | sapi/servlet/servlet.c | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index 9a4e409fa8..733cfba0e5 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -321,7 +321,7 @@ PHP_FUNCTION(virtual) } php_end_ob_buffers(1 TSRMLS_CC); - php_header(); + php_header(TSRMLS_C); if (run_sub_req(rr)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - request execution failed", (*filename)->value.str.val); diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 665af1eec7..1664528dbe 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -92,7 +92,7 @@ PHP_FUNCTION(virtual) /* Flush everything. */ php_end_ob_buffers(1 TSRMLS_CC); - php_header(); + php_header(TSRMLS_C); if (ap_run_sub_req(rr)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - request execution failed", Z_STRVAL_PP(filename)); diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index 9ac4a8bb3c..a7869c3e43 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -1732,7 +1732,7 @@ PHP_FUNCTION(virtual) } php_end_ob_buffers(1 TSRMLS_CC); - php_header(); + php_header(TSRMLS_C); if (run_sub_req(rr)) { php_error(E_WARNING, "Unable to include '%s' - request execution failed", (*filename)->value.str.val); diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 769fab13b9..5d99c2244f 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -464,7 +464,9 @@ static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC) static void sapi_cgi_log_message(char *message) { - if (php_header()) { + TSRMLS_FETCH(); + + if (php_header(TSRMLS_C)) { fprintf(stderr, "%s", message); fprintf(stderr, "\n"); } diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index c053aef435..1fedbe1c35 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -238,7 +238,9 @@ static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC) static void sapi_cli_log_message(char *message) { - if (php_header()) { + TSRMLS_FETCH(); + + if (php_header(TSRMLS_C)) { fprintf(stderr, "%s", message); fprintf(stderr, "\n"); } diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index e82a4dd1b1..5d859e53a3 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -375,7 +375,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send } } else { php_execute_script(&file_handle TSRMLS_CC); - php_header(); /* Make sure headers have been sent */ + php_header(TSRMLS_C); /* Make sure headers have been sent */ } /* |