Skip to content

Commit 9474205

Browse files
committed
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
2 parents 35a68c2 + 8f9ab04 commit 9474205

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

ext/standard/config.m4

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ main() {
170170
ac_cv_crypt_blowfish=no
171171
])])
172172

173-
AC_CACHE_CHECK(for SHA512 crypt, ac_cv_crypt_SHA512,[
173+
AC_CACHE_CHECK(for SHA512 crypt, ac_cv_crypt_sha512,[
174174
AC_TRY_RUN([
175175
#if HAVE_UNISTD_H
176176
#include <unistd.h>
@@ -192,14 +192,14 @@ main() {
192192
exit(0);
193193
#endif
194194
}],[
195-
ac_cv_crypt_SHA512=yes
195+
ac_cv_crypt_sha512=yes
196196
],[
197-
ac_cv_crypt_SHA512=no
197+
ac_cv_crypt_sha512=no
198198
],[
199-
ac_cv_crypt_SHA512=no
199+
ac_cv_crypt_sha512=no
200200
])])
201201

202-
AC_CACHE_CHECK(for SHA256 crypt, ac_cv_crypt_SHA256,[
202+
AC_CACHE_CHECK(for SHA256 crypt, ac_cv_crypt_sha256,[
203203
AC_TRY_RUN([
204204
#if HAVE_UNISTD_H
205205
#include <unistd.h>
@@ -222,11 +222,11 @@ main() {
222222
exit(0);
223223
#endif
224224
}],[
225-
ac_cv_crypt_SHA256=yes
225+
ac_cv_crypt_sha256=yes
226226
],[
227-
ac_cv_crypt_SHA256=no
227+
ac_cv_crypt_sha256=no
228228
],[
229-
ac_cv_crypt_SHA256=no
229+
ac_cv_crypt_sha256=no
230230
])])
231231

232232

0 commit comments

Comments
 (0)