From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 11 Oct 2017 12:43:30 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0RC5~71^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62098a10aa56e5460e3f4316fc06a40bc1bf2da0;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Use PHP_VERSION for exif
---

62098a10aa56e5460e3f4316fc06a40bc1bf2da0
diff --cc NEWS
index 658206221b,f132a66fa6..1e56bac1d4
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.26
 +?? ??? 2017, PHP 7.1.12
  
- 
+ - Exif:
+   . Fixed bug #75301 (Exif extension has built in revision version). (Peter
+     Kokot).
  
 -26 Oct 2017 PHP 7.0.25
 +26 Sep 2017, PHP 7.1.11
  
  - Core:
    . Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).