diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-31 06:28:05 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-31 06:28:05 +0000 |
| commit | bc42c37513a730b0b3ff9cf29e14e45e4ec50c71 (patch) | |
| tree | c4857143995f88a04e3f9d56cb5f8d757fa07575 /sapi | |
| parent | 0b7fdbb690b0270d13266a83521d1fd03e2c270c (diff) | |
| download | php-git-bc42c37513a730b0b3ff9cf29e14e45e4ec50c71.tar.gz | |
More TSRMLS_FETCH work. Got it under 400 now.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/pi3web/pi3web_sapi.c | 2 | ||||
| -rw-r--r-- | sapi/servlet/servlet.c | 4 | ||||
| -rw-r--r-- | sapi/tux/php_tux.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c index 66c5be1783..3a52e14cd2 100644 --- a/sapi/pi3web/pi3web_sapi.c +++ b/sapi/pi3web/pi3web_sapi.c @@ -413,7 +413,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) break; case PHP_MODE_INDENT: header_line = (char *)estrdup("Content-Type: text/plain"); - sapi_add_header_ex(header_line, strlen(header_line), 1, 1); + sapi_add_header_ex(header_line, strlen(header_line), 1, 1 TSRMLS_CC); if ( open_file_for_scanning( &file_handle TSRMLS_CC ) == SUCCESS ) { zend_indent(); diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index 364d0c51b2..a8ecd3a8d9 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -318,8 +318,6 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send char cwd[MAXPATHLEN]; #endif TSRMLS_FETCH(); - TSRMLS_FETCH(); - TSRMLS_FETCH(); zend_try { SG(server_context) = emalloc(sizeof(servlet_request)); @@ -379,7 +377,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send if (open_file_for_scanning(&file_handle TSRMLS_CC)==SUCCESS) { php_get_highlight_struct(&syntax_highlighter_ini); - sapi_send_headers(); + sapi_send_headers(TSRMLS_C); zend_highlight(&syntax_highlighter_ini TSRMLS_CC); } } else { diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c index 215e4d5cbe..482e5be6df 100644 --- a/sapi/tux/php_tux.c +++ b/sapi/tux/php_tux.c @@ -186,7 +186,7 @@ static void sapi_tux_register_variables(zval *track_vars_array TSRMLS_DC) sprintf(buf, "Server: %s", TUXAPI_version); - sapi_add_header_ex(buf, strlen(buf), 1, 0); + sapi_add_header_ex(buf, strlen(buf), 1, 0 TSRMLS_CC); php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_FETCH()CC TSRMLS_FETCH()CC); |