com php-src: Kill another TSRMLS_FECH() in sapi/roxen : sapi/roxen/roxen.c

From: Date: Wed, 18 Dec 2013 08:05:01 +0000
Subject: com php-src: Kill another TSRMLS_FECH() in sapi/roxen : sapi/roxen/roxen.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74490@lists.php.net to get a copy of this message
Commit: f70f89c1b1e0bbd2b2b6940bb0a4e12a2be07770 Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 18 Dec 2013 09:05:01 +0100 Parents: 520d969feade9076bd93578992cee09c4e4a07ec Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f70f89c1b1e0bbd2b2b6940bb0a4e12a2be07770 Log: Kill another TSRMLS_FECH() in sapi/roxen Changed paths: M sapi/roxen/roxen.c Diff: diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index c897ef6..2b93cc5 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; }

« previous php.cvs (#74490) next »