Commit:    2c3f6dcdb6de8cd43371e91fb470e547aa217327
Author:    Andrey Hristov <and...@php.net>         Mon, 8 Jul 2013 20:28:51 
+0200
Parents:   9fc38183b707341b6eddb8c196d0ea2b7c13d6a9 
e4a28b7b7b972fecd01458364c0663195352891e
Branches:  PHP-5.4

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

Log:
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

Conflicts:
        NEWS

Changed paths:
  MM  NEWS


Diff:
diff --cc NEWS
index 04dc482,1d3385a..d20ec7e
--- a/NEWS
+++ b/NEWS
@@@ -18,12 -20,19 +20,22 @@@ 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: 
-   . 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)
 +
 +- mysqlnd: 
 +  . Fixed segfault in mysqlnd when doing long prepare. (Andrey)
    
  - ODBC:
    . Fixed bug #61387 (NULL valued anonymous column causes segfault in


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

Reply via email to