Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
This commit is contained in:
Felipe Pena 2015-02-17 00:28:28 -02:00
commit 0c01fca444

View file

@ -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 <unistd.h>
@ -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 <unistd.h>
@ -222,11 +222,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
])])