From 5b6269a2531137cdb7c32f62bd47caa82b9c6bb5 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Sat, 14 Feb 2015 05:34:57 +0900 Subject: [PATCH 1/3] Update NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 462d6a1733a..a3d35b77077 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ PHP NEWS (Stas) . Fixed bug #68925 (Mitigation for CVE-2015-0235 – GHOST: glibc gethostbyname buffer overflow). (Stas) + . Added NULL byte protection to exec, system and passthru. (Yasuo) 22 Jan 2015 PHP 5.4.37 - Core: From e08bef442c63a3e0f9eac43d8f5e09213347d3ca Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Mon, 16 Feb 2015 13:07:26 -0200 Subject: [PATCH 2/3] - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de --- ext/soap/php_xml.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index f7c8fd51e59..bf30ab40aaa 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -100,6 +100,9 @@ xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC) ctxt->sax->warning = NULL; ctxt->sax->error = NULL; /*ctxt->sax->fatalError = NULL;*/ +#if LIBXML_VERSION >= 20703 + ctxt->options |= XML_PARSE_HUGE; +#endif old = php_libxml_disable_entity_loader(1 TSRMLS_CC); xmlParseDocument(ctxt); php_libxml_disable_entity_loader(old TSRMLS_CC); From 8f9ab04d9340eea8415607cbfe06b6cbff131c95 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Tue, 17 Feb 2015 00:23:47 -0200 Subject: [PATCH 3/3] - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support) --- ext/standard/config.m4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index c1f5aff7c25..edbda35738b 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -170,7 +170,7 @@ main() { ac_cv_crypt_blowfish=no ])]) -AC_CACHE_CHECK(for SHA512 crypt, ac_cv_crypt_SHA512,[ +AC_CACHE_CHECK(for SHA512 crypt, ac_cv_crypt_sha512,[ AC_TRY_RUN([ #if HAVE_UNISTD_H #include @@ -192,14 +192,14 @@ main() { exit(0); #endif }],[ - ac_cv_crypt_SHA512=yes + ac_cv_crypt_sha512=yes ],[ - ac_cv_crypt_SHA512=no + ac_cv_crypt_sha512=no ],[ - ac_cv_crypt_SHA512=no + ac_cv_crypt_sha512=no ])]) -AC_CACHE_CHECK(for SHA256 crypt, ac_cv_crypt_SHA256,[ +AC_CACHE_CHECK(for SHA256 crypt, ac_cv_crypt_sha256,[ AC_TRY_RUN([ #if HAVE_UNISTD_H #include @@ -221,11 +221,11 @@ main() { exit(0); #endif }],[ - ac_cv_crypt_SHA256=yes + ac_cv_crypt_sha256=yes ],[ - ac_cv_crypt_SHA256=no + ac_cv_crypt_sha256=no ],[ - ac_cv_crypt_SHA256=no + ac_cv_crypt_sha256=no ])])