]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.6:
  Fix stream_select() issue with OpenSSL buffer

1  2 
ext/openssl/xp_ssl.c
main/php_streams.h
main/streams/streams.c

Simple merge
Simple merge
Simple merge