From: Joe Watkins <krakjoe@php.net>
Date: Thu, 20 Apr 2017 05:39:26 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=242bdf7e8bdaf3a64ec9e5eab244cae9e2d3e074;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Update php_network.h
---

242bdf7e8bdaf3a64ec9e5eab244cae9e2d3e074