From 6fb3908463792fdb025f57e58f612cbb6ef31a93 Mon Sep 17 00:00:00 2001 From: robert Date: Tue, 11 Dec 2007 12:45:08 +0000 Subject: [PATCH] Integrate a patch from php's CVS repo to fix a crashing issue due to an uninitialized variable. from Brad --- www/php5/core/Makefile | 6 +++--- www/php5/core/patches/patch-main_SAPI_c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 www/php5/core/patches/patch-main_SAPI_c diff --git a/www/php5/core/Makefile b/www/php5/core/Makefile index 419bc08a9d2..f06afba2d27 100644 --- a/www/php5/core/Makefile +++ b/www/php5/core/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.32 2007/11/15 20:24:02 alek Exp $ +# $OpenBSD: Makefile,v 1.33 2007/12/11 12:45:08 robert Exp $ COMMENT-main= server-side HTML-embedded scripting language COMMENT-fastcgi=stand-alone FastCGI version of PHP PKGNAME= php5-core-${V} -PKGNAME-main= php5-core-${V}p0 -PKGNAME-fastcgi=php5-fastcgi-${V} +PKGNAME-main= php5-core-${V}p1 +PKGNAME-fastcgi=php5-fastcgi-${V}p0 DISTFILES= php-${V}.tar.gz diff --git a/www/php5/core/patches/patch-main_SAPI_c b/www/php5/core/patches/patch-main_SAPI_c new file mode 100644 index 00000000000..f63184d6403 --- /dev/null +++ b/www/php5/core/patches/patch-main_SAPI_c @@ -0,0 +1,19 @@ +$OpenBSD: patch-main_SAPI_c,v 1.1 2007/12/11 12:45:08 robert Exp $ +--- main/SAPI.c.orig Tue Dec 11 13:34:05 2007 ++++ main/SAPI.c Tue Dec 11 13:34:46 2007 +@@ -301,6 +301,7 @@ SAPI_API void sapi_activate_headers_only(TSRMLS_D) + + /* SG(sapi_headers).http_response_code = 200; */ + SG(sapi_headers).http_status_line = NULL; ++ SG(sapi_headers).mimetype = NULL; + SG(read_post_bytes) = 0; + SG(request_info).post_data = NULL; + SG(request_info).raw_post_data = NULL; +@@ -340,6 +341,7 @@ SAPI_API void sapi_activate(TSRMLS_D) + SG(sapi_headers).http_response_code = 200; + */ + SG(sapi_headers).http_status_line = NULL; ++ SG(sapi_headers).mimetype = NULL; + SG(headers_sent) = 0; + SG(read_post_bytes) = 0; + SG(request_info).post_data = NULL;