diff options
author | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
---|---|---|
committer | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
commit | 8eb7e7bf7f63f49e97f112871df47c6d6213e715 (patch) | |
tree | 24b9059118cf6abb5fe0837eaa477b4668b18435 /sapi/thttpd | |
parent | 58ed832fc99d5c5aeac7849819bbc4e0dc90d698 (diff) | |
parent | 95836a350420cabc2e8e5f5c45131fba46504a3b (diff) | |
download | php-git-8eb7e7bf7f63f49e97f112871df47c6d6213e715.tar.gz |
Merge branch 'master' into issue-67910
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
Diffstat (limited to 'sapi/thttpd')
-rw-r--r-- | sapi/thttpd/php_thttpd.h | 2 | ||||
-rw-r--r-- | sapi/thttpd/thttpd.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sapi/thttpd/php_thttpd.h b/sapi/thttpd/php_thttpd.h index 75e79b4054..df7fb455e1 100644 --- a/sapi/thttpd/php_thttpd.h +++ b/sapi/thttpd/php_thttpd.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c index f6ba8585b9..1671a5b65b 100644 --- a/sapi/thttpd/thttpd.c +++ b/sapi/thttpd/thttpd.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -181,7 +181,7 @@ static int sapi_thttpd_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) if (!SG(sapi_headers).http_status_line) { ADD_VEC_S("HTTP/1.1 "); - p = smart_str_print_long(buf+sizeof(buf)-1, + p = zend_print_long_to_buf(buf+sizeof(buf)-1, SG(sapi_headers).http_response_code); ADD_VEC(p, strlen(p)); ADD_VEC_S(" HTTP\r\n"); @@ -293,7 +293,7 @@ static void sapi_thttpd_register_variables(zval *track_vars_array TSRMLS_DC) ADD_STRING_EX("REMOTE_HOST", p); ADD_STRING_EX("SERVER_PORT", - smart_str_print_long(buf + sizeof(buf) - 1, + zend_print_long_to_buf(buf + sizeof(buf) - 1, TG(hc)->hs->port)); buf[0] = '/'; @@ -323,7 +323,7 @@ static void sapi_thttpd_register_variables(zval *track_vars_array TSRMLS_DC) if (TG(hc)->contentlength != -1) { ADD_STRING_EX("CONTENT_LENGTH", - smart_str_print_long(buf + sizeof(buf) - 1, + zend_print_long_to_buf(buf + sizeof(buf) - 1, TG(hc)->contentlength)); } @@ -468,7 +468,7 @@ static void thttpd_request_ctor(TSRMLS_D) static void thttpd_request_dtor(TSRMLS_D) { - smart_str_free_ex(&TG(sbuf), 1); + smart_str_free(&TG(sbuf)); if (SG(request_info).query_string) free(SG(request_info).query_string); free(SG(request_info).request_uri); |