From: Joe Watkins <krakjoe@php.net>
Date: Sat, 15 Jun 2019 06:09:17 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7231ee9f55c2c44aef46f9cac5bda051b54a060f;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  fix flaky socket tests
---

7231ee9f55c2c44aef46f9cac5bda051b54a060f