From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 05:40:08 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f89aec7169a095fc9d6dce4a94c726923a577f0;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430
---

3f89aec7169a095fc9d6dce4a94c726923a577f0
diff --cc NEWS
index 3c8a4cf830,a11d4b2cb8..3c37416288
--- a/NEWS
+++ b/NEWS
@@@ -5,7 -5,10 +5,10 @@@ PH
  - Phar:
    . Fixed bug #70417 (PharData::compress() doesn't close temp file). (cmb)
  
+ - ZIP:
+   . Fixed bug #70103 (ZipArchive::addGlob ignores remove_all_path option). (cmb)
+ 
 -19 Jan 2017 PHP 7.0.15
 +19 Jan 2017, PHP 7.1.1
  
  - Core:
    . Fixed bug #73792 (invalid foreach loop hangs script). (Dmitry)