Commit | Line | Data |
---|---|---|
e054b9eb FF |
1 | diff -u -r ../php-5.6.15/ext/standard/basic_functions.c ./ext/standard/basic_functions.c |
2 | --- ../php-5.6.15/ext/standard/basic_functions.c 2015-10-29 05:55:01.000000000 -0400 | |
3 | +++ ./ext/standard/basic_functions.c 2015-11-10 16:01:20.858601990 -0500 | |
4 | @@ -1834,6 +1834,7 @@ | |
5 | ZEND_END_ARG_INFO() | |
6 | /* }}} */ | |
7 | /* {{{ password.c */ | |
8 | +#if HAVE_CRYPT | |
9 | ZEND_BEGIN_ARG_INFO_EX(arginfo_password_hash, 0, 0, 2) | |
10 | ZEND_ARG_INFO(0, password) | |
11 | ZEND_ARG_INFO(0, algo) | |
12 | @@ -1851,6 +1852,7 @@ | |
13 | ZEND_ARG_INFO(0, password) | |
14 | ZEND_ARG_INFO(0, hash) | |
15 | ZEND_END_ARG_INFO() | |
16 | +#endif | |
17 | /* }}} */ | |
18 | /* {{{ proc_open.c */ | |
19 | #ifdef PHP_CAN_SUPPORT_PROC_OPEN | |
20 | @@ -2860,12 +2862,14 @@ | |
21 | PHP_FE(base64_decode, arginfo_base64_decode) | |
22 | PHP_FE(base64_encode, arginfo_base64_encode) | |
23 | ||
24 | +#if HAVE_CRYPT | |
25 | PHP_FE(password_hash, arginfo_password_hash) | |
26 | PHP_FE(password_get_info, arginfo_password_get_info) | |
27 | PHP_FE(password_needs_rehash, arginfo_password_needs_rehash) | |
28 | PHP_FE(password_verify, arginfo_password_verify) | |
29 | PHP_FE(convert_uuencode, arginfo_convert_uuencode) | |
30 | PHP_FE(convert_uudecode, arginfo_convert_uudecode) | |
31 | +#endif | |
32 | ||
33 | PHP_FE(abs, arginfo_abs) | |
34 | PHP_FE(ceil, arginfo_ceil) | |
35 | @@ -3620,7 +3624,9 @@ | |
36 | BASIC_MINIT_SUBMODULE(browscap) | |
37 | BASIC_MINIT_SUBMODULE(standard_filters) | |
38 | BASIC_MINIT_SUBMODULE(user_filters) | |
39 | +#if HAVE_CRYPT | |
40 | BASIC_MINIT_SUBMODULE(password) | |
41 | +#endif | |
42 | ||
43 | #if defined(HAVE_LOCALECONV) && defined(ZTS) | |
44 | BASIC_MINIT_SUBMODULE(localeconv) |