diff options
| author | Felipe Pena <felipensp@gmail.com> | 2015-02-17 00:28:11 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2015-02-17 00:28:11 -0200 |
| commit | a331ae46308a03461a7b1fc9ab4daf995675d05d (patch) | |
| tree | d21ba7d8d8bac4b0785737ca62e7c355b145afc3 /ext/standard/config.m4 | |
| parent | a620b7904023202b8b4a5d7792368bd752c432e9 (diff) | |
| parent | 8f9ab04d9340eea8415607cbfe06b6cbff131c95 (diff) | |
| download | php-git-a331ae46308a03461a7b1fc9ab4daf995675d05d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* 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
Diffstat (limited to 'ext/standard/config.m4')
| -rw-r--r-- | ext/standard/config.m4 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 3d00d88dda..9a8528662a 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 <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 ])]) |