]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58088c2 6569db8)
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)
* PHP-5.4:
  Bug #41631: Observe socket read timeouts in SSL streams

1  2 
ext/openssl/xp_ssl.c patch | diff1 | diff2 | blob | history

diff --cc ext/openssl/xp_ssl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.