]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorChris Wright <daverandom@php.net>
Wed, 27 Aug 2014 15:35:28 +0000 (16:35 +0100)
committerChris Wright <daverandom@php.net>
Wed, 27 Aug 2014 15:35:28 +0000 (16:35 +0100)
commit0a1df748957f6cfddebeee70f0b4ea1778a34871
tree4e67a01cf4f39878592635023158484c129b9f18
parent8ec40397cdedabcfedc09c8a43d8c4693875baed
parentdb03216e62180000d7296c0498f7141ce62f66d8
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix stream_select() issue with OpenSSL buffer
ext/openssl/xp_ssl.c
main/php_streams.h
main/streams/streams.c