diff options
| author | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
|---|---|---|
| committer | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
| commit | 8defcb855ab01d9c8ab4759cb793d80149b55a8c (patch) | |
| tree | ed51eb30a2cbc92b102557498fb3e4113da1bb07 /ext/standard/php_crypt.h | |
| parent | 9c7dbb0487f5991fde03873ea8f5e66d6688415f (diff) | |
| parent | baddb1c73a170ef1d2c31bd54cddbc6e1ab596b9 (diff) | |
| download | php-git-8defcb855ab01d9c8ab4759cb793d80149b55a8c.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (6215 commits)
Extra comma
Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators
Simplification
zend_get_property_info_quick() cleanup and optimization
initialize lineno before calling compile file file in phar
Use ADDREF instead of DUP, it must be enough.
Removed old irrelevant comment
fixed compilation error
Fix bug #68262: Broken reference across cloned objects
export functions needed for phpdbg
Fixed compilation
Optimized property access handlers. Removed EG(std_property_info).
Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
Don't make difference between undefined and unaccessible properies when call __get() and family
Don't make useless CSE
array_pop/array_shift optimization
check for zlib headers as well as lib for mysqlnd
a realpath cache key can be int or float, catching this
News entry for new curl constants
News entry for new curl constants
...
Diffstat (limited to 'ext/standard/php_crypt.h')
| -rw-r--r-- | ext/standard/php_crypt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/php_crypt.h b/ext/standard/php_crypt.h index 6025685539..c861187649 100644 --- a/ext/standard/php_crypt.h +++ b/ext/standard/php_crypt.h @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -23,7 +23,7 @@ #ifndef PHP_CRYPT_H #define PHP_CRYPT_H -PHPAPI int php_crypt(const char *password, const int pass_len, const char *salt, int salt_len, char **result); +PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const char *salt, int salt_len); PHP_FUNCTION(crypt); #if HAVE_CRYPT PHP_MINIT_FUNCTION(crypt); |