diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-04-14 09:27:37 -0600 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-04-14 09:27:37 -0600 |
| commit | 4f07330e798a4e7b12bcc1811c3c71d17b71f22c (patch) | |
| tree | 2939bee1628dcf9b923c9195721008660e1a426a /Zend/zend_vm_opcodes.c | |
| parent | a7059f1eac383a8e42f06586d06ffd5193ed61ef (diff) | |
| parent | 81f356b4aea79cd8f86e16096c7ccfbc455bfc3c (diff) | |
| download | php-git-4f07330e798a4e7b12bcc1811c3c71d17b71f22c.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix Bug #69402: Reading empty SSL stream hangs until timeout
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'Zend/zend_vm_opcodes.c')
0 files changed, 0 insertions, 0 deletions