From: Anatol Belski <ab@php.net>
Date: Thu, 27 Apr 2017 09:11:41 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.6RC1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=392bcba58d76fb497c0d0fccca97ee809a237871;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

392bcba58d76fb497c0d0fccca97ee809a237871