From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 7 Aug 2017 21:56:31 +0000 (+0200)
Subject: Merge branch 'pull-request/2664'
X-Git-Tag: php-7.3.0alpha1~1694
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=791410ab66ead3f5517e7b02f7457d302a6b8707;p=php

Merge branch 'pull-request/2664'

* pull-request/2664:
  Fix unittest for minimal length in random string
  Add support for webp in imagecreatefromstring
---

791410ab66ead3f5517e7b02f7457d302a6b8707
diff --cc NEWS
index 842b9a3924,035eac82b8..364bd09c7e
--- a/NEWS
+++ b/NEWS
@@@ -12,6 -11,6 +12,9 @@@ PH
    . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support).
      (cebe)
  
++- GD:
++  . Added support for WebP in imagecreatefromstring() (Andreas Treichel, cmb).
++
  - LDAP:
    . Added ldap_exop_refresh helper for EXOP REFRESH operation with dds overlay. 
      (Come)