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/pi3web | |
| 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/pi3web')
| -rw-r--r-- | sapi/pi3web/pi3web_sapi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c index 362ec133fc..30eb7ba36e 100644 --- a/sapi/pi3web/pi3web_sapi.c +++ b/sapi/pi3web/pi3web_sapi.c @@ -320,7 +320,7 @@ static void init_request_info(sapi_globals_struct *sapi_globals, LPCONTROL_BLOCK SG(sapi_headers).http_response_code = 200; } -static void hash_pi3web_variables(ELS_D SLS_DC) +static void hash_pi3web_variables(TSRMLS_D SLS_DC) { char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE]; char *variable_buf; @@ -379,7 +379,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) int iRet = PIAPI_COMPLETED; SLS_FETCH(); CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); zend_try { @@ -390,13 +390,13 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) CG(extended_info) = 0; init_request_info(sapi_globals, lpCB); - php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); + php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC); - hash_pi3web_variables(ELS_C SLS_CC); + hash_pi3web_variables(TSRMLS_C SLS_CC); switch ( lpCB->dwBehavior ) { case PHP_MODE_STANDARD: - iRet = ( php_execute_script( &file_handle CLS_CC ELS_CC PLS_CC ) == SUCCESS ) ? + iRet = ( php_execute_script( &file_handle CLS_CC TSRMLS_CC PLS_CC ) == SUCCESS ) ? PIAPI_COMPLETED : PIAPI_ERROR; break; case PHP_MODE_HIGHLIGHT: { @@ -426,7 +426,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) efree(header_line); break; case PHP_MODE_LINT: - iRet = (php_lint_script(&file_handle CLS_CC ELS_CC PLS_CC) == SUCCESS) ? + iRet = (php_lint_script(&file_handle CLS_CC TSRMLS_CC PLS_CC) == SUCCESS) ? PIAPI_COMPLETED : PIAPI_ERROR; break; default: |