From: Kalle Sommer Nielsen Date: Wed, 18 Dec 2013 08:05:01 +0000 (+0100) Subject: Kill another TSRMLS_FECH() in sapi/roxen X-Git-Tag: PRE_PHPNG_MERGE~353^2~131 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f70f89c1b1e0bbd2b2b6940bb0a4e12a2be07770;p=php Kill another TSRMLS_FECH() in sapi/roxen --- diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index c897ef62be..2b93cc5e91 100644 --- a/sapi/roxen/roxen.c +++ b/sapi/roxen/roxen.c @@ -387,13 +387,12 @@ php_roxen_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) * the client. Used for POST/PUT requests. */ -INLINE static int php_roxen_low_read_post(char *buf, uint count_bytes) +INLINE static int php_roxen_low_read_post(char *buf, uint count_bytes TSRMLS_DC) { uint total_read = 0; #ifdef ROXEN_USE_ZTS GET_THIS(); #endif - TSRMLS_FETCH(); if(!MY_FD_OBJ->prog) { @@ -417,7 +416,7 @@ static int php_roxen_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC) { uint total_read = 0; - THREAD_SAFE_RUN(total_read = php_roxen_low_read_post(buf, count_bytes), "read post"); + THREAD_SAFE_RUN(total_read = php_roxen_low_read_post(buf, count_bytes TSRMLS_CC), "read post"); return total_read; }