diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
| commit | fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5 (patch) | |
| tree | c7bc98cac58386828871aae860f90cac0ebdcf8f /sapi/phttpd | |
| parent | 2c254ba762d9392a732d5793b5b193ee6e395f1c (diff) | |
| download | php-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/phttpd')
| -rw-r--r-- | sapi/phttpd/phttpd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c index 7bcce209df..7ea34fc795 100644 --- a/sapi/phttpd/phttpd.c +++ b/sapi/phttpd/phttpd.c @@ -261,10 +261,10 @@ int php_doit(PHLS_D SLS_DC) struct httpinfo *hip = PHG(cip)->hip; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) { return -1; } @@ -273,9 +273,9 @@ int php_doit(PHLS_D SLS_DC) file_handle.free_filename = 0; /* - php_phttpd_hash_environment(PHLS_C CLS_CC ELS_CC PLS_CC SLS_CC); + php_phttpd_hash_environment(PHLS_C CLS_CC TSRMLS_CC PLS_CC SLS_CC); */ - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); return SG(sapi_headers).http_response_code; @@ -287,7 +287,7 @@ int pm_init(const char **argv) sapi_startup(&phttpd_sapi_module); phttpd_sapi_module.startup(&phttpd_sapi_module); - ph_globals_id = ts_allocate_id(sizeof(phttpd_globals_struct), NULL, NULL); + ts_allocate_id(&ph_globals_id, sizeof(phttpd_globals_struct), NULL, NULL); return 0; } |