From: Anatol Belski <ab@php.net>
Date: Thu, 27 Apr 2017 09:13:00 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha2~15^2~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2111de0dd7d226bbb121565d32effe55cd2d3677;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Revert "Detect invalid port in xp_socket parse ip address"
  Revert "Follow up patch regarding bug #74216, see bug #74429"
---

2111de0dd7d226bbb121565d32effe55cd2d3677