1 files changed, 57 insertions, 65 deletions

diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c
index 290c88c766..bf60e04106 100644
--- a/sapi/tux/php_tux.c
+++ b/sapi/tux/php_tux.c
@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 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        |
@@ -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"
 
@@ -49,20 +49,20 @@ static php_tux_globals tux_globals;
 
 #define TG(v) (tux_globals.v)
 
-static int sapi_tux_ub_write(const char *str, uint str_length TSRMLS_DC)
+static int sapi_tux_ub_write(const char *str, uint str_length)
 {
 	int n;
 	int m;
 	const char *estr;
-	
+
 	/* combine headers and body */
 	if (TG(number_vec)) {
 		struct iovec *vec = TG(header_vec);
-		
+
 		n = TG(number_vec);
 		vec[n].iov_base = (void *) str;
 		vec[n++].iov_len = str_length;
-		
+
 		/* XXX: this might need more complete error handling */
 		if ((m = writev(TG(req)->sock, vec, n)) == -1 && errno == EPIPE)
 			php_handle_aborted_connection();
@@ -75,7 +75,7 @@ static int sapi_tux_ub_write(const char *str, uint str_length TSRMLS_DC)
 	}
 
 	estr = str + str_length;
-	
+
 	while (str < estr) {
 		n = send(TG(req)->sock, str, estr - str, 0);
 
@@ -83,14 +83,14 @@ static int sapi_tux_ub_write(const char *str, uint str_length TSRMLS_DC)
 			php_handle_aborted_connection();
 		if (n == -1 && errno == EAGAIN)
 			continue;
-		if (n <= 0) 
+		if (n <= 0)
 			return n;
 
 		str += n;
 	}
 
 	n = str_length - (estr - str);
-	
+
 	TG(req)->bytes_sent += n;
 
 	return n;
@@ -107,35 +107,34 @@ 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;
-	
+
 	vec = malloc(sizeof(struct iovec) * max_headers);
 	status_line = malloc(30);
-	
+
 	/* safe sprintf use */
 	len = slprintf(status_line, 30, "HTTP/1.1 %d NA\r\n", SG(sapi_headers).http_response_code);
-	
+
 	vec[0].iov_base = status_line;
 	vec[0].iov_len = len;
-	
+
 	TG(req)->http_status = SG(sapi_headers).http_response_code;
 
 	if (TG(tux_action) == TUX_ACTION_FINISH_CLOSE_REQ && TG(req)->http_version == HTTP_1_1)
 		locate_cl = 1;
 	else
 		locate_cl = 0;
-	
+
 	h = zend_llist_get_first_ex(&sapi_headers->headers, &pos);
 	while (h) {
-		if (locate_cl 
+		if (locate_cl
 				&& strncasecmp(h->header, "Content-length:", sizeof("Content-length:")-1) == 0) {
 			TG(tux_action) = TUX_ACTION_FINISH_REQ;
 			locate_cl = 0;
 		}
-			
+
 		vec[n].iov_base = h->header;
 		vec[n++].iov_len = h->header_len;
 		if (n >= max_headers - 3) {
@@ -144,7 +143,7 @@ static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers)
 		}
 		vec[n].iov_base = "\r\n";
 		vec[n++].iov_len = 2;
-		
+
 		h = zend_llist_get_next_ex(&sapi_headers->headers, &pos);
 	}
 
@@ -154,7 +153,7 @@ static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers)
 	TG(number_vec) = n;
 	TG(header_vec) = vec;
 
-	
+
 	return SAPI_HEADER_SENT_SUCCESSFULLY;
 }
 
@@ -162,7 +161,6 @@ static int sapi_tux_read_post(char *buffer, uint count_bytes)
 {
 #if 0
 	int amount = 0;
-	TSRMLS_FETCH();
 
 	TG(req)->objectlen = count_bytes;
 	TG(req)->object_addr = buffer;
@@ -170,7 +168,7 @@ static int sapi_tux_read_post(char *buffer, uint count_bytes)
 		return 0;
 
 	TG(read_post_data) = 1;
-	
+
 	return TG(req)->objectlen;
 #else
 	return 0;
@@ -179,33 +177,31 @@ static int sapi_tux_read_post(char *buffer, uint count_bytes)
 
 static char *sapi_tux_read_cookies(void)
 {
-	TSRMLS_FETCH();
-	
 	return TG(req)->cookies;
 }
 
 #define BUF_SIZE 512
 #define ADD_STRING(name)										\
-	php_register_variable(name, buf, track_vars_array TSRMLS_CC)
+	php_register_variable(name, buf, track_vars_array)
 
-static void sapi_tux_register_variables(zval *track_vars_array TSRMLS_DC)
+static void sapi_tux_register_variables(zval *track_vars_array)
 {
 	char buf[BUF_SIZE + 1];
 	char *p;
 	sapi_header_line ctr = {0};
-	
+
 	ctr.line = buf;
 	ctr.line_len = slprintf(buf, sizeof(buf), "Server: %s", TUXAPI_version);
-	sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC);
-	
-	php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_CC);
-	php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array TSRMLS_CC);
-	php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC);
-	php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_CC);
-	php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array TSRMLS_CC);
-	php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array TSRMLS_CC);
-	php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_CC);
-	php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_CC);
+	sapi_header_op(SAPI_HEADER_REPLACE, &ctr);
+
+	php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array);
+	php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array);
+	php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array);
+	php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array);
+	php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array);
+	php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array);
+	php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array);
+	php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array);
 
 	p = inet_ntoa(TG(req)->client_host);
 	/* string representation of IPs are never larger than 512 bytes */
@@ -228,7 +224,7 @@ static void sapi_tux_register_variables(zval *track_vars_array TSRMLS_DC)
 
 #define CONDADD(name, field) 							\
 	if (TG(req)->field[0]) {								\
-		php_register_variable(#name, TG(req)->field, track_vars_array TSRMLS_CC); \
+		php_register_variable(#name, TG(req)->field, track_vars_array); \
 	}
 
 	CONDADD(HTTP_REFERER, referer);
@@ -248,7 +244,7 @@ static void sapi_tux_register_variables(zval *track_vars_array TSRMLS_DC)
 
 #if 0
 	if (TG(hc)->authorization[0])
-		php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_CC);
+		php_register_variable("AUTH_TYPE", "Basic", track_vars_array);
 #endif
 }
 
@@ -265,10 +261,10 @@ static int php_tux_startup(sapi_module_struct *sapi_module)
 static sapi_module_struct tux_sapi_module = {
 	"tux",
 	"tux",
-	
+
 	php_tux_startup,
 	php_module_shutdown_wrapper,
-	
+
 	NULL,									/* activate */
 	NULL,									/* deactivate */
 
@@ -278,7 +274,7 @@ static sapi_module_struct tux_sapi_module = {
 	NULL,									/* getenv */
 
 	php_error,
-	
+
 	NULL,
 	sapi_tux_send_headers,
 	NULL,
@@ -293,7 +289,7 @@ static sapi_module_struct tux_sapi_module = {
 	STANDARD_SAPI_MODULE_PROPERTIES
 };
 
-static void tux_module_main(TSRMLS_D)
+static void tux_module_main(void)
 {
 	zend_file_handle file_handle;
 
@@ -302,15 +298,15 @@ static void tux_module_main(TSRMLS_D)
 	file_handle.free_filename = 0;
 	file_handle.opened_path = NULL;
 
-	if (php_request_startup(TSRMLS_C) == FAILURE) {
+	if (php_request_startup() == FAILURE) {
 		return;
 	}
-	
-	php_execute_script(&file_handle TSRMLS_CC);
+
+	php_execute_script(&file_handle);
 	php_request_shutdown(NULL);
 }
 
-static void tux_request_ctor(TSRMLS_D)
+static void tux_request_ctor(void)
 {
 	char buf[1024];
 	int offset;
@@ -319,7 +315,7 @@ static void tux_request_ctor(TSRMLS_D)
 	smart_str s = {0};
 	char *p;
 
-	TG(number_vec) = 0;	
+	TG(number_vec) = 0;
 	TG(header_vec) = NULL;
 	SG(request_info).query_string = strdup(TG(req)->query);
 
@@ -330,7 +326,7 @@ static void tux_request_ctor(TSRMLS_D)
 	if (p)
 		*p = '\0';
 	SG(request_info).path_translated = s.c;
-	
+
 	s.c = NULL;
 	smart_str_appendc_ex(&s, '/', 1);
 	smart_str_appends_ex(&s, TG(req)->objectname, 1);
@@ -344,11 +340,11 @@ static void tux_request_ctor(TSRMLS_D)
 	SG(request_info).content_length = 0; /* TG(req)->contentlength; */
 
 #if 0
-	php_handle_auth_data(TG(hc)->authorization TSRMLS_CC);
+	php_handle_auth_data(TG(hc)->authorization);
 #endif
 }
 
-static void tux_request_dtor(TSRMLS_D)
+static void tux_request_dtor(void)
 {
 	if (TG(header_vec)) {
 		/* free status_line */
@@ -366,14 +362,14 @@ static void *separate_thread(void *bla)
 {
 	int fd;
 	int i = 0;
-	
+
 	fd = (int) bla;
 
 	while (i++ < 5) {
 		send(fd, "test<br />\n", 9, 0);
 		sleep(1);
 	}
-	
+
 	tux(TUX_ACTION_CONTINUE_REQ, (user_req_t *) fd);
 	/* We HAVE to trigger some event on the fd. Otherwise
 	   fast_thread won't wake up, so that the eventloop
@@ -385,47 +381,43 @@ static void *separate_thread(void *bla)
 
 int TUXAPI_handle_events(user_req_t *req)
 {
-	TSRMLS_FETCH();
 
 	if (req->event == PHP_TUX_BACKGROUND_CONN) {
 		tux_closed_conn(req->sock);
 		return tux(TUX_ACTION_FINISH_CLOSE_REQ, req);
 	}
-	
+
 	TG(req) = req;
 	TG(tux_action) = TUX_ACTION_FINISH_CLOSE_REQ;
-	
-	tux_request_ctor(TSRMLS_C);
 
-	tux_module_main(TSRMLS_C);
+	tux_request_ctor();
+
+	tux_module_main();
 
-	tux_request_dtor(TSRMLS_C);
+	tux_request_dtor();
 
 	return tux(TG(tux_action), req);
 }
 
-void tux_register_on_close(void (*arg)(int)) 
+void tux_register_on_close(void (*arg)(int))
 {
 	TG(on_close) = arg;
 }
 
 void tux_closed_conn(int fd)
 {
-	TSRMLS_FETCH();
 
 	if (TG(on_close)) TG(on_close)(fd);
 }
 
 int tux_get_fd(void)
 {
-	TSRMLS_FETCH();
-	
+
 	return TG(req)->sock;
 }
 
 void tux_set_dont_close(void)
 {
-	TSRMLS_FETCH();
 
 	TG(req)->event = PHP_TUX_BACKGROUND_CONN;
 	tux(TUX_ACTION_POSTPONE_REQ, TG(req));