From: Sara Golemon <pollita@php.net>
Date: Tue, 7 Mar 2017 20:11:22 +0000 (-0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.4RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a19b97ac3e824138a5fde4b86638b6d69f64a78;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Detect invalid port in xp_socket parse ip address
---

1a19b97ac3e824138a5fde4b86638b6d69f64a78