diff options
| author | Julien Pauli <jpauli@php.net> | 2015-05-13 14:21:19 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-05-13 14:21:19 +0200 |
| commit | 420961524d9a6482b01f90ebbb7a5d2622bcc176 (patch) | |
| tree | 656fd2bee8cf5d8c5b5dc64382f8978e02d37a5f /ext/mcrypt/php_mcrypt.h | |
| parent | 4f5ab6fca49843657e241eddf6e4b08fbdf226b4 (diff) | |
| parent | c09fad97d68d07d6b528d56d5cef1f8cbb9fc5ec (diff) | |
| download | php-git-420961524d9a6482b01f90ebbb7a5d2622bcc176.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Close fd at the end, otherwise people complain
Add file descriptor caching to mcrypt_create_iv()
Conflicts:
ext/mcrypt/mcrypt.c
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 f29eec72d7..1fc9e41fe8 100644 --- a/ext/mcrypt/php_mcrypt.h +++ b/ext/mcrypt/php_mcrypt.h @@ -80,6 +80,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 |