diff options
| author | Julien Pauli <jpauli@php.net> | 2015-05-13 14:19:04 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-05-13 14:19:04 +0200 |
| commit | c09fad97d68d07d6b528d56d5cef1f8cbb9fc5ec (patch) | |
| tree | 191306091ef0e8ffc66cf432cca8577a71156bfc /ext/mcrypt/php_mcrypt.h | |
| parent | 1b12982d39361a0b3a5b6621fa4ad3af58003857 (diff) | |
| parent | f7952b90cad735e2a588c305d425c24550b3775d (diff) | |
| download | php-git-c09fad97d68d07d6b528d56d5cef1f8cbb9fc5ec.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Close fd at the end, otherwise people complain
Add file descriptor caching to mcrypt_create_iv()
Diffstat (limited to 'ext/mcrypt/php_mcrypt.h')
| -rw-r--r-- | ext/mcrypt/php_mcrypt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mcrypt/php_mcrypt.h b/ext/mcrypt/php_mcrypt.h index 4bc226110b..9bfad99e9b 100644 --- a/ext/mcrypt/php_mcrypt.h +++ b/ext/mcrypt/php_mcrypt.h @@ -77,6 +77,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mcrypt) int le_h; char *modes_dir; char *algorithms_dir; + int fd[2]; // RANDOM = 0, URANDOM = 1 ZEND_END_MODULE_GLOBALS(mcrypt) #ifdef ZTS |