From d256caf7815d7f8714097984d4a29d109ae8c5f2 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 2 Mar 2012 08:21:54 +0000 Subject: [PATCH] Merge: Fix bug #61184 Phar::webPhar() generates headers with trailing NUL bytes --- NEWS | 3 +++ ext/phar/phar_object.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 66f7f06c7d..ac804e0b22 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,9 @@ PHP NEWS - Installation . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones) +- Phar + . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL bytes). (Nikita Popov) + - Reflection: . Fixed bug #60968 (Late static binding doesn't work with ReflectionMethod::invokeArgs()). (Laruence) diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 782acfa7f8..de9fffc115 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -428,7 +428,7 @@ static void phar_do_403(char *entry, int entry_len TSRMLS_DC) /* {{{ */ sapi_header_line ctr = {0}; ctr.response_code = 403; - ctr.line_len = sizeof("HTTP/1.0 403 Access Denied"); + ctr.line_len = sizeof("HTTP/1.0 403 Access Denied")-1; ctr.line = "HTTP/1.0 403 Access Denied"; sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC); sapi_send_headers(TSRMLS_C); @@ -453,7 +453,7 @@ static void phar_do_404(phar_archive_data *phar, char *fname, int fname_len, cha } ctr.response_code = 404; - ctr.line_len = sizeof("HTTP/1.0 404 Not Found")+1; + ctr.line_len = sizeof("HTTP/1.0 404 Not Found")-1; ctr.line = "HTTP/1.0 404 Not Found"; sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC); sapi_send_headers(TSRMLS_C); @@ -893,7 +893,7 @@ PHP_METHOD(Phar, webPhar) char *tmp = NULL, sa = '\0'; sapi_header_line ctr = {0}; ctr.response_code = 301; - ctr.line_len = sizeof("HTTP/1.1 301 Moved Permanently")+1; + ctr.line_len = sizeof("HTTP/1.1 301 Moved Permanently")-1; ctr.line = "HTTP/1.1 301 Moved Permanently"; sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC); -- 2.40.0