Skip to content

Commit

Permalink
Merge branch 'PHP-5.4' into PHP-5.5
Browse files Browse the repository at this point in the history
* PHP-5.4:
  - 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
  • Loading branch information
felipensp committed Feb 17, 2015
2 parents 35a68c2 + 8f9ab04 commit 9474205
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions ext/standard/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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
])])


Expand Down

0 comments on commit 9474205

Please sign in to comment.