From: Stanislav Malyshev <stas@php.net>
Date: Fri, 28 Jun 2013 20:55:26 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~17^2~21^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4020ef8980cb2236566aec9d59c8e0f62fb6098a;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  Update NEWS
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing
---

4020ef8980cb2236566aec9d59c8e0f62fb6098a
diff --cc NEWS
index dca43ccf07,ffd89affe5..e16640cf21
--- a/NEWS
+++ b/NEWS
@@@ -15,17 -17,23 +15,19 @@@ PH
  - CLI server:
    . Fixed bug #65066 (Cli server not responsive when responding with 422 http
      status code). (Adam)
 -    
 -- FPM:
 -  . Fixed bug #63983 (enabling FPM borks compile on FreeBSD).
 -    (chibisuke at web dot de, Felipe)
 -    
 -- Imap:
 -  . Fixed bug #64467 (Segmentation fault after imap_reopen failure).
 -    (askalski at gmail dot com)
 -
 -- Intl: 
 +
 +- GD
 +  . Fixed #65070 (bgcolor does not use the same format as the input image with
 +    imagerotate). (Pierre)
 +  . Fixed Bug #65060 (imagecreatefrom... crashes with user streams). (Remi)
 +  . Fixed Bug #65084 (imagecreatefromjpeg fails with URL). (Remi)
 +  . Fix gdImageCreateFromWebpCtx and use same logic to load WebP image
 +    that other formats. (Remi)
 +
 +- Intl:
-   . Fixed bug #62759: Buggy grapheme_substr() on edge case. (Stas)
+   . Fixed bug #62759 (Buggy grapheme_substr() on edge case). (Stas)
+   . Fixed bug #61860 (Offsets may be wrong for grapheme_stri* functions).
+     (Stas)
 -  
 -- ODBC:
 -  . Fixed bug #61387 (NULL valued anonymous column causes segfault in 
 -    odbc_fetch_array). (Brandon Kirsch)
  
  - PDO:
    . Allowed PDO_OCI to compile with Oracle Database 12c client libraries.