]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 898b5e5 98e67ad)
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 7 Aug 2014 16:17:29 +0000 (12:17 -0400)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 7 Aug 2014 16:17:29 +0000 (12:17 -0400)
* PHP-5.6:
  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.