mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove HAVE_CRYPT checks

Browse Source 
We always provide a crypt implementation. HAVE_CRYPT is only
relevant as to whether the crypt() C function exists.
This commit is contained in:
Nikita Popov 2016-03-25 21:06:10 +01:00
parent be7a50b9ab
commit d3ed75b9eb
6 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/opcache/Optimizer/zend_func_info.c
View File

@ -699,9 +699,7 @@ static const func_info_t func_infos[] = {
F1("pack", MAY_BE_FALSE | MAY_BE_STRING),
F1("unpack", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY),
F1("get_browser", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_OBJECT | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
#if HAVE_CRYPT
F1("crypt", MAY_BE_NULL | MAY_BE_STRING),
#endif
F1("opendir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
F1("closedir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
F1("chdir", MAY_BE_FALSE | MAY_BE_TRUE),

10
ext/standard/basic_functions.c
View File

@ -872,12 +872,10 @@ ZEND_END_ARG_INFO()
/* }}} */
/* {{{ crypt.c */
#if HAVE_CRYPT
ZEND_BEGIN_ARG_INFO_EX(arginfo_crypt, 0, 0, 1)
ZEND_ARG_INFO(0, str)
ZEND_ARG_INFO(0, salt)
ZEND_END_ARG_INFO()
#endif
/* }}} */
/* {{{ cyr_convert.c */
ZEND_BEGIN_ARG_INFO(arginfo_convert_cyr_string, 0)
@ -3170,10 +3168,8 @@ const zend_function_entry basic_functions[] = { /* {{{ */
/* functions from browscap.c */
PHP_FE(get_browser, arginfo_get_browser)
#if HAVE_CRYPT
/* functions from crypt.c */
PHP_FE(crypt, arginfo_crypt)
#endif
/* functions from dir.c */
PHP_FE(opendir, arginfo_opendir)
@ -3643,10 +3639,7 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
BASIC_MINIT_SUBMODULE(nl_langinfo)
#endif
#if HAVE_CRYPT
BASIC_MINIT_SUBMODULE(crypt)
#endif
BASIC_MINIT_SUBMODULE(lcg)
BASIC_MINIT_SUBMODULE(dir)
@ -3715,10 +3708,7 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
#if defined(HAVE_LOCALECONV) && defined(ZTS)
BASIC_MSHUTDOWN_SUBMODULE(localeconv)
#endif
#if HAVE_CRYPT
BASIC_MSHUTDOWN_SUBMODULE(crypt)
#endif
BASIC_MSHUTDOWN_SUBMODULE(random)
zend_hash_destroy(&basic_submodules);

2
ext/standard/crypt.c
View File

@ -24,7 +24,6 @@
#include <stdlib.h>
#include "php.h"
#if HAVE_CRYPT
#if HAVE_UNISTD_H
#include <unistd.h>
@ -287,7 +286,6 @@ PHP_FUNCTION(crypt)
RETURN_STR(result);
}
/* }}} */
#endif
/*
* Local variables:

2
ext/standard/password.c
View File

@ -21,7 +21,6 @@
#include <stdlib.h>
#include "php.h"
#if HAVE_CRYPT
#include "fcntl.h"
#include "php_password.h"
@ -384,7 +383,6 @@ PHP_FUNCTION(password_hash)
}
/* }}} */
#endif /* HAVE_CRYPT */
/*
* Local variables:
* tab-width: 4

2
ext/standard/php_crypt.h
View File

@ -25,11 +25,9 @@
PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const char *salt, int salt_len, zend_bool quiet);
PHP_FUNCTION(crypt);
#if HAVE_CRYPT
PHP_MINIT_FUNCTION(crypt);
PHP_MSHUTDOWN_FUNCTION(crypt);
PHP_RINIT_FUNCTION(crypt);
#endif
#endif

3
win32/build/config.w32.h.in
View File

@ -22,9 +22,6 @@
#define PHP_PREFIX "@PREFIX@"
#define PHP_SYSCONFDIR "@PREFIX@"
/* Enable / Disable crypt() function (default: enabled) */
#define HAVE_CRYPT 1
/* PHP Runtime Configuration */
#define PHP_URL_FOPEN 1
#define USE_CONFIG_FILE 1