From 26ff3a4c1e8b809558ba8fd9238693fac0a39041 Mon Sep 17 00:00:00 2001 From: George Wang Date: Fri, 3 Oct 2014 16:41:32 -0400 Subject: [PATCH 1/2] Fixed a bug that causes crash when environment variable is access while parsing php.ini --- sapi/litespeed/lsapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 789ebf24607..425d638f9ef 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -69,7 +69,7 @@ #define SAPI_LSAPI_MAX_HEADER_LENGTH 2048 -static int lsapi_mode = 1; +static int lsapi_mode = 0; static char *php_self = ""; static char *script_filename = ""; static int source_highlight = 0; @@ -1053,6 +1053,7 @@ int main( int argc, char * argv[] ) LSAPI_Init(); LSAPI_Init_Env_Parameters( NULL ); + lsapi_mode = 1; slow_script_msec = LSAPI_Get_Slow_Req_Msecs(); From 82b07b62c06e9e55ab3590f20bd80a84ce73a801 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 10 Oct 2014 11:40:07 +0200 Subject: [PATCH 2/2] update NEWS Signed-off-by: Ard Biesheuvel --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index e702e32167a..9b4248e2688 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2014, PHP 5.4.34 +-Fileinfo: + . Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB) + - Core: . Fixed bug #67985 (Incorrect last used array index copied to new array after unset). (Tjerk)