]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit217c8edd006db9acc9e30c5ed422d8d838cce2e4
tree0a9715740402f3a251c6952a7a6453e6d92e18detree | snapshot
parent898b5e5d52626d99e50f4a94fc18a44f6bbb9473commit | diff
parent98e67add15a6b889efe152c23ed15a61f022a63acommit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #41631: Observe socket read timeouts in SSL streams
ext/openssl/xp_ssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.