]> granicus.if.org Git - php/commit
Merge branch 'bug-47030' of https://github.com/rdlowrey/php-src into PHP-5.6
authorDaniel Lowrey <rdlowrey@php.net>
Fri, 14 Feb 2014 22:37:49 +0000 (15:37 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Fri, 14 Feb 2014 22:37:49 +0000 (15:37 -0700)
commit734d887b401bae04f3abc285cd3902372871aedf
tree28ca13b870dcce053ab4f9deb90e4bcf0e6bc80b
parentf073588e7529ea12d3023369ddad78167b00e31b
parentce8dc0ede2e8084beef1e7b03c8960e938c8399f
Merge branch 'bug-47030' of https://github.com/rdlowrey/php-src into PHP-5.6

* 'bug-47030' of https://github.com/rdlowrey/php-src:
  Bug #47030 (separate host and peer verification)