]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 7 Aug 2014 15:51:42 +0000 (11:51 -0400)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 7 Aug 2014 15:51:42 +0000 (11:51 -0400)
commit5ac2e5f850c483394870dadca465c1322a4a51cf
tree817f423a71945e6a482ff9776ce1ab0c81aa2f0c
parent58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec
parent6569db88081562f68a4f79e52cba83482bdf05fc
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #41631: Observe socket read timeouts in SSL streams
ext/openssl/xp_ssl.c