com php-src: Fix these SAPI hooks so that the TSRMLS parameters are correctly passed as required by the sapi struct: sapi/tux/php _tux.c

Commit: 520d969feade9076bd93578992cee09c4e4a07ec Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 18 Dec 2013 09:01:44 +0100 Parents: 432e91f1121595e2dacd6f5ee6436b5f8c12dde6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=520d969feade9076bd93578992cee09c4e4a07ec Log: Fix these SAPI hooks so that the TSRMLS parameters are correctly passed as required by the sapi struct # Not sure if this builds either Changed paths: M sapi/tux/php_tux..c Diff: diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c index 968dd9e..1dbcf38 100644 --- a/sapi/tux/php_tux.c +++ b/sapi/tux/php_tux.c @@ -96,7 +96,7 @@ static int sapi_tux_ub_write(const char *str, uint str_length TSRMLS_DC) return n; } -static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers) +static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) { char buf[1024]; struct iovec *vec; @@ -107,7 +107,6 @@ static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers) size_t len; char *status_line; int locate_cl; - TSRMLS_FETCH(); max_headers = 30; n = 1; @@ -158,11 +157,10 @@ static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers) return SAPI_HEADER_SENT_SUCCESSFULLY; } -static int sapi_tux_read_post(char *buffer, uint count_bytes) +static int sapi_tux_read_post(char *buffer, uint count_bytes TSRMLS_DC) { #if 0 int amount = 0; - TSRMLS_FETCH(); TG(req)->objectlen = count_bytes; TG(req)->object_addr = buffer; @@ -177,10 +175,8 @@ static int sapi_tux_read_post(char *buffer, uint count_bytes) #endif } -static char *sapi_tux_read_cookies(void) +static char *sapi_tux_read_cookies(TSRMLS_D) { - TSRMLS_FETCH(); - return TG(req)->cookies; }