summaryrefslogtreecommitdiff
path: root/sapi/fastcgi
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-07-27 10:16:41 +0000
committerZeev Suraski <zeev@php.net>2001-07-27 10:16:41 +0000
commitfe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5 (patch)
treec7bc98cac58386828871aae860f90cac0ebdcf8f /sapi/fastcgi
parent2c254ba762d9392a732d5793b5b193ee6e395f1c (diff)
downloadphp-git-fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5.tar.gz
- Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API This patch is *bound* to break some files, as I must have had typos somewhere. If you use any uncommon extension, please try to build it...
Diffstat (limited to 'sapi/fastcgi')
-rw-r--r--sapi/fastcgi/fastcgi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index e9ee629fc7..344c343c88 100644
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -147,7 +147,7 @@ static char *sapi_fastcgi_read_cookies(SLS_D)
}
-static void sapi_fastcgi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
char *self = getenv("REQUEST_URI");
char *ptr = strchr( self, '?' );
@@ -162,7 +162,7 @@ static void sapi_fastcgi_register_variables(zval *track_vars_array ELS_DC SLS_DC
/* strip query string off this */
if ( ptr ) *ptr = 0;
- php_register_variable( "PHP_SELF", getenv("REQUEST_URI"), track_vars_array ELS_CC PLS_CC);
+ php_register_variable( "PHP_SELF", getenv("REQUEST_URI"), track_vars_array TSRMLS_CC PLS_CC);
if ( ptr ) *ptr = '?';
}
@@ -203,7 +203,7 @@ static void fastcgi_module_main(TLS_D SLS_DC)
{
zend_file_handle file_handle;
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
@@ -211,8 +211,8 @@ static void fastcgi_module_main(TLS_D SLS_DC)
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == SUCCESS) {
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == SUCCESS) {
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_request_shutdown(NULL);
}
}