From 26ff3a4c1e8b809558ba8fd9238693fac0a39041 Mon Sep 17 00:00:00 2001 From: George Wang Date: Fri, 3 Oct 2014 16:41:32 -0400 Subject: [PATCH 1/5] 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 a88feb139c7667b9eb69762652f96e1b63a2e61c Mon Sep 17 00:00:00 2001 From: Tjerk Meesters Date: Fri, 10 Oct 2014 07:33:06 +0800 Subject: [PATCH 2/5] Added note to UPGRADING regarding 64-bit support in pack()/unpack() --- UPGRADING | 1 + 1 file changed, 1 insertion(+) diff --git a/UPGRADING b/UPGRADING index d4dd3033567..514662a5646 100644 --- a/UPGRADING +++ b/UPGRADING @@ -217,6 +217,7 @@ PHP 5.6 UPGRADE NOTES - Strings: substr_compare() now allows $length to be zero. + pack() and unpack() now support 64-bit format specifiers: q, Q, J and P. - Crypt: crypt() will now raise an E_NOTICE error if the salt parameter is omitted. From 82b07b62c06e9e55ab3590f20bd80a84ce73a801 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 10 Oct 2014 11:40:07 +0200 Subject: [PATCH 3/5] 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) From b73ef0ee4a8276734f6df180148dce2f445950ed Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 10 Oct 2014 11:44:39 +0200 Subject: [PATCH 4/5] update NEWS Signed-off-by: Ard Biesheuvel --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index d3c57b86c14..cb69e029a26 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2014, PHP 5.5.19 +-Fileinfo: + . Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB) + - Core: . Fixed bug #68118 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita) . Fixed bug #68129 (parse_url() - incomplete support for empty usernames From 3e13c6dcb2928fb4af110f316f66619a99f7b4a7 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 10 Oct 2014 11:45:24 +0200 Subject: [PATCH 5/5] update NEWS Signed-off-by: Ard Biesheuvel --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 4f6ce962a90..49ce35a30c3 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2014, PHP 5.6.2 +-Fileinfo: + . Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB) + - Core: . Fixed bug #67739 (Windows 8.1/Server 2012 R2 OS build number reported as 6.2 (instead of 6.3)). (Christian Wenz)