diff options
| author | Sascha Schumann <sas@php.net> | 2001-08-05 14:27:39 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-08-05 14:27:39 +0000 |
| commit | 2cce13fd50411ff524e34c3cc27f9a2087cec115 (patch) | |
| tree | de4a07fe5160b6842942959adaef7317031a8209 /sapi/roxen | |
| parent | 0af7ad15f58587a48aeee460f15cb24a7bf97760 (diff) | |
| download | php-git-2cce13fd50411ff524e34c3cc27f9a2087cec115.tar.gz | |
further tsrm cleanup
Diffstat (limited to 'sapi/roxen')
| -rw-r--r-- | sapi/roxen/roxen.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index c670d6b6bb..9dd8708e86 100644 --- a/sapi/roxen/roxen.c +++ b/sapi/roxen/roxen.c @@ -214,12 +214,11 @@ static int php_roxen_low_ub_write(const char *str, uint str_length) { int sent_bytes = 0; struct pike_string *to_write = NULL; -#ifdef ZTS - TSRMLS_FETCH(); -#endif #ifdef ROXEN_USE_ZTS GET_THIS(); #endif + TSRMLS_FETCH(); + if(!MY_FD_OBJ->prog) { PG(connection_status) = PHP_CONNECTION_ABORTED; zend_bailout(); @@ -246,12 +245,11 @@ php_roxen_low_ub_write(const char *str, uint str_length) { static int php_roxen_sapi_ub_write(const char *str, uint str_length) { -#ifdef ZTS - TSRMLS_FETCH(); -#endif #ifdef ROXEN_USE_ZTS GET_THIS(); #endif + TSRMLS_FETCH(); + int sent_bytes = 0, fd = MY_FD; if(fd) { @@ -352,14 +350,12 @@ php_roxen_sapi_header_handler(sapi_header_struct *sapi_header, static int php_roxen_low_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) { -#ifdef ZTS - TSRMLS_FETCH(); -#endif struct pike_string *ind; struct svalue *s_headermap; #ifdef ROXEN_USE_ZTS GET_THIS(); #endif + if(!MY_FD_OBJ->prog) { PG(connection_status) = PHP_CONNECTION_ABORTED; zend_bailout(); @@ -399,9 +395,7 @@ INLINE static int php_roxen_low_read_post(char *buf, uint count_bytes) #ifdef ROXEN_USE_ZTS GET_THIS(); #endif -#ifdef ZTS TSRMLS_FETCH(); -#endif if(!MY_FD_OBJ->prog) { @@ -583,12 +577,9 @@ static int php_roxen_module_main(TSRMLS_D) int res, len; char *dir; zend_file_handle file_handle; -#ifdef ZTS - TSRMLS_FETCH(); #ifdef ROXEN_USE_ZTS GET_THIS(); #endif -#endif file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = THIS->filename; @@ -621,10 +612,10 @@ void f_php_roxen_request_handler(INT32 args) struct svalue *done_callback, *raw_fd; struct pike_string *script, *ind; int status = 1; - TSRMLS_FETCH(); #ifdef ROXEN_USE_ZTS GET_THIS(); #endif + TSRMLS_FETCH(); if(current_thread == th_self()) error("PHP4.Interpreter->run: Tried to run a PHP-script from a PHP " |