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/servlet/servlet.c | |
| 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/servlet/servlet.c')
| -rw-r--r-- | sapi/servlet/servlet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index fd48663be9..14f2a42a8a 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -290,7 +290,7 @@ JNIEXPORT jlong JNICALL Java_net_php_servlet_define pval *pzval; jlong addr = 0; const char *nameAsUTF = (*jenv)->GetStringUTFChars(jenv, name, 0); - ELS_FETCH(); + TSRMLS_FETCH(); MAKE_STD_ZVAL(pzval); addr = (jlong)(long) pzval; @@ -321,7 +321,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send SLS_FETCH(); PLS_FETCH(); CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); zend_try { SG(server_context) = emalloc(sizeof(servlet_request)); @@ -342,7 +342,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send SG(sapi_headers).http_response_code = 200; SG(request_info).content_length = contentLength; SG(request_info).auth_password = NULL; - 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) { ThrowServletException(jenv,"request startup failure"); return; } @@ -385,7 +385,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send zend_highlight(&syntax_highlighter_ini); } } else { - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_header(); /* Make sure headers have been sent */ } |