From: Daniel Lowrey <rdlowrey@php.net>
Date: Fri, 14 Feb 2014 22:37:49 +0000 (-0700)
Subject: Merge branch 'bug-47030' of https://github.com/rdlowrey/php-src into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=734d887b401bae04f3abc285cd3902372871aedf;p=php

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)
---

734d887b401bae04f3abc285cd3902372871aedf