]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Fri, 6 Mar 2015 00:53:04 +0000 (17:53 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Fri, 6 Mar 2015 00:53:04 +0000 (17:53 -0700)
commit88cfc6ccb6594e8bacd4adce45094dc2d4d65eac
tree303be68f46f6c165b697252ecd483a5ef4835233
parent28e42b1deda228402aa768b78e086dc785bb10b0
parente7df9d710cfb6bbb059ab673bb5851515b2a3aa9
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix stream_select() issue with OpenSSL buffer

Conflicts:
main/streams/streams.c
ext/openssl/xp_ssl.c
main/php_streams.h
main/streams/streams.c