]> granicus.if.org Git - php/commitdiff
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)
* 'bug-47030' of https://github.com/rdlowrey/php-src:
  Bug #47030 (separate host and peer verification)


Trivial merge