From: Andrea Faulds <ajf@ajf.me>
Date: Sat, 19 Aug 2017 19:35:22 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0RC1~29^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=158b06cffb01b528940bb9cf9ac8f298a62dfc55;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

158b06cffb01b528940bb9cf9ac8f298a62dfc55
diff --cc NEWS
index 0736b93e88,ee4ffab2ef..052e9a78cb
--- a/NEWS
+++ b/NEWS
@@@ -8,8 -8,10 +8,10 @@@ PH
  - CURL:
    . Fixed bug #75093 (OpenSSL support not detected). (Remi)
  
+ - Standard:
+   . Fixed bug #75097 (gethostname fails if your host name is 64 chars long). (Andrea)
  
 -31 Aug 2017 PHP 7.0.23
 +31 Aug 2017, PHP 7.1.9
  
  - Core:
    . Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)