diff options
Diffstat (limited to 'sapi/tux')
| -rw-r--r-- | sapi/tux/README | 16 | ||||
| -rw-r--r-- | sapi/tux/config.m4 | 2 | ||||
| -rw-r--r-- | sapi/tux/php_tux.c | 14 |
3 files changed, 14 insertions, 18 deletions
diff --git a/sapi/tux/README b/sapi/tux/README index 92c021123f..3c5ebc56ba 100644 --- a/sapi/tux/README +++ b/sapi/tux/README @@ -56,31 +56,31 @@ BUILD INSTRUCTIONS $ ./configure --help - 3. Touch a file in your web-root 'php5.tux'. This will - cause requests to '/php5.tux' to be redirected to the - userspace module php5.tux. + 3. Touch a file in your web-root 'php7.tux'. This will + cause requests to '/php7.tux' to be redirected to the + userspace module php7.tux. 4. Start TUX with something like - # tux -d -t 8 -r /www -m /tux-modules php5.tux + # tux -d -t 8 -r /www -m /tux-modules php7.tux (daemon mode, eight threads, web-root /www, modules in - /tux-modules, load php5.tux) + /tux-modules, load php7.tux) BEFORE running this command, the kernel side of TUX has to be properly setup. 5. Try to access - http://yourserver/php5.tux?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000 + http://yourserver/php7.tux?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000 It should display the PHP credits page. To access a script /foo/bar.php, use - http://yourserver/php5.tux?/foo/bar.php + http://yourserver/php7.tux?/foo/bar.php Parameters can be appended: - http://yourserver/php5.tux?/foo/bar.php&var=value + http://yourserver/php7.tux?/foo/bar.php&var=value diff --git a/sapi/tux/config.m4 b/sapi/tux/config.m4 index 06788be757..db4be82cf1 100644 --- a/sapi/tux/config.m4 +++ b/sapi/tux/config.m4 @@ -7,7 +7,7 @@ PHP_ARG_WITH(tux,, AC_MSG_CHECKING([for TUX]) if test "$PHP_TUX" != "no"; then - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so" + INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php7.tux.so" AC_CHECK_HEADERS(tuxmodule.h,[:],[AC_MSG_ERROR([Cannot find tuxmodule.h])]) PHP_SELECT_SAPI(tux, shared, php_tux.c) AC_MSG_RESULT([$PHP_TUX]) diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c index 55d911f8ab..783fe852bc 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 | +----------------------------------------------------------------------+ @@ -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" @@ -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; } |