summaryrefslogtreecommitdiff
path: root/sapi/roxen
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2001-08-05 15:29:47 +0000
committerSascha Schumann <sas@php.net>2001-08-05 15:29:47 +0000
commit8aef1930565d36807647e52b5e5b7c4e3f4a57b1 (patch)
treeb5aedc9051d566b1bcf94fef22e5d2798b33a7ea /sapi/roxen
parent02fea7ed2358518441637a1fbe5113bc4f92dd9d (diff)
downloadphp-git-8aef1930565d36807647e52b5e5b7c4e3f4a57b1.tar.gz
more tsrm cleanup
Diffstat (limited to 'sapi/roxen')
-rw-r--r--sapi/roxen/roxen.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 9dd8708e86..81f67c43d0 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -211,13 +211,12 @@ INLINE static int lookup_integer_header(char *headername, int default_value)
*/
static int
-php_roxen_low_ub_write(const char *str, uint str_length) {
+php_roxen_low_ub_write(const char *str, uint str_length TSRMLS_DC) {
int sent_bytes = 0;
struct pike_string *to_write = NULL;
#ifdef ROXEN_USE_ZTS
GET_THIS();
#endif
- TSRMLS_FETCH();
if(!MY_FD_OBJ->prog) {
PG(connection_status) = PHP_CONNECTION_ABORTED;
@@ -243,12 +242,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)
+php_roxen_sapi_ub_write(const char *str, uint str_length TSRMLS_DC)
{
#ifdef ROXEN_USE_ZTS
GET_THIS();
#endif
- TSRMLS_FETCH();
int sent_bytes = 0, fd = MY_FD;
if(fd)
@@ -276,7 +274,7 @@ php_roxen_sapi_ub_write(const char *str, uint str_length)
}
}
} else {
- THREAD_SAFE_RUN(sent_bytes = php_roxen_low_ub_write(str, str_length),
+ THREAD_SAFE_RUN(sent_bytes = php_roxen_low_ub_write(str, str_length TSRMLS_CC),
"write");
}
return sent_bytes;