]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2cdc1a2 5ac2e5f)
Merge branch 'PHP-5.5' into PHP-5.6
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 7 Aug 2014 16:07:55 +0000 (12:07 -0400)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 7 Aug 2014 16:07:55 +0000 (12:07 -0400)
commit98e67add15a6b889efe152c23ed15a61f022a63a
tree20a15e8f32cc3549e9731942cffc865c6aaabc0dtree | snapshot
parent2cdc1a2b7473eff27c224c66dcb85118b553a147commit | diff
parent5ac2e5f850c483394870dadca465c1322a4a51cfcommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #41631: Observe socket read timeouts in SSL streams

Conflicts:
ext/openssl/xp_ssl.c
ext/openssl/xp_ssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.