From 520d969feade9076bd93578992cee09c4e4a07ec Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Wed, 18 Dec 2013 09:01:44 +0100 Subject: Fix these SAPI hooks so that the TSRMLS parameters are correctly passed as required by the sapi struct # Not sure if this builds either --- sapi/tux/php_tux.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'sapi/tux/php_tux.c') diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c index 968dd9eb91..1dbcf3882e 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; } -- cgit v1.2.1 From c081ce628f0d76d44784d7bb8e06428b06142ac0 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:08:10 +0800 Subject: Bump year --- sapi/tux/php_tux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/tux/php_tux.c') diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c index 968dd9eb91..55d911f8ab 100644 --- a/sapi/tux/php_tux.c +++ b/sapi/tux/php_tux.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- sapi/tux/php_tux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/tux/php_tux.c') diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c index 9dba8efbfe..9bff4f1695 100644 --- a/sapi/tux/php_tux.c +++ b/sapi/tux/php_tux.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1 From e33f3d3b7c9a69fe069484045a27d282aa98b00e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 20 Sep 2014 22:42:02 +0200 Subject: Move smart_str implementation into Zend/ So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h. --- sapi/tux/php_tux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/tux/php_tux.c') diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c index 9bff4f1695..783fe852bc 100644 --- a/sapi/tux/php_tux.c +++ b/sapi/tux/php_tux.c @@ -21,7 +21,7 @@ #include "php_main.h" #include "php_variables.h" -#include "ext/standard/php_smart_str.h" +#include "zend_smart_str.h" #include "tuxmodule.h" -- cgit v1.2.1