Commit:    4020ef8980cb2236566aec9d59c8e0f62fb6098a
Author:    Stanislav Malyshev <s...@php.net>         Fri, 28 Jun 2013 13:55:26 
-0700
Parents:   70ae67b5da00ffca9bc03f27f8c82246bd3526c1 
e46beabe8fee2b46b174868cba4df1536b225713
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=4020ef8980cb2236566aec9d59c8e0f62fb6098a

Log:
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

Bugs:
https://bugs.php.net/61860

Changed paths:
  MM  NEWS


Diff:
diff --cc NEWS
index dca43cc,ffd89af..e16640c
--- 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.


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to