]> granicus.if.org Git - php/commit
Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix
authorDaniel Lowrey <rdlowrey@php.net>
Tue, 27 Jan 2015 18:22:47 +0000 (13:22 -0500)
committerDaniel Lowrey <rdlowrey@php.net>
Tue, 27 Jan 2015 18:22:47 +0000 (13:22 -0500)
commit4965fe7fb8c0fdc8a666bee37f46cad329fefe1f
treee31225f389ddd6c6e869e25a36eab3cb48bf2a22
parent95142d901568963b3f9d0cf0d9782021bd83f35f
parent8302d658db17a8314b0e2f9c71e536ec42fd2dcd
Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix

Conflicts:
ext/openssl/xp_ssl.c
ext/openssl/xp_ssl.c