From: Daniel Lowrey <rdlowrey@php.net>
Date: Fri, 14 Feb 2014 22:40:36 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8562b8c1631c694cc99102f68056df1ac9af6ded;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #47030 (separate host and peer verification)
---

8562b8c1631c694cc99102f68056df1ac9af6ded