Commit:    54cef2bb6d4d0527ac161b900b0b475d2ce312fb
Author:    Xinchen Hui <larue...@php.net>         Thu, 18 Oct 2012 17:32:48 
+0800
Parents:   4d509708a454c736a2f15f1a4ec7567c26659086 
8bd5e15ff7a57791956c4017ee8fb4a8ac0d8d2e
Branches:  PHP-5.4

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

Log:
Merge branch 'PHP-5.3' into PHP-5.4

Changed paths:
  MM  NEWS
  MM  ext/pcre/php_pcre.c


Diff:
diff --cc NEWS
index eca6698,009f082..49980d1
--- a/NEWS
+++ b/NEWS
@@@ -1,29 -1,25 +1,33 @@@
  PHP                                                                        
NEWS
  
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2012, PHP 5.3.19
 +?? ??? 2012, PHP 5.4.9
  
 -- MySQL:
 -  . Fixed compilation failure on mixed 32/64 bit systems. (Andrey)
 +- Fileinfo:
 +  . Fixed bug #63248 (Load multiple magic files from a directory under 
Windows).
 +    (Anatoliy)
  
+ - PCRE:
+   . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite).
+     (Dmitry, Laruence)
+ 
 -- PDO:
 -  . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec).
 -    (Martin Osvald, Remi)
 -
 -- Streams:
 -  . Fixed bug #63240 (stream_get_line() return contains delimiter string).
 -    (Tjerk, Gustavo)
 +?? ??? 2012, PHP 5.4.8
  
 -18 Oct 2012, PHP 5.3.18
 +- CLI server:
 +  . Implemented FR #63242 (Default error page in PHP built-in web server uses 
 +    outdated html/css). (pascal.chev...@free.fr)
 +  . Changed response to unknown HTTP method to 501 according to RFC.
 +    (Niklas Lindgren).
 +  . Support HTTP PATCH method. Patch by Niklas Lindgren, GitHub PR #190.
 +    (Lars)
  
  - Core:
 +  . Fixed bug #63219 (Segfault when aliasing trait method when autoloader
 +    throws excpetion). (Laruence)
 +  . Added optional second argument for assert() to specify custom message. 
Patch
 +    by Lonny Kapelushnik (lo...@lonnylot.com). (Lars)
 +  . Support building PHP with the native client toolchain. (Stuart Langley)
 +  . Added --offline option for tests. (Remi)
 +  . Fixed bug #63162 (parse_url does not match password component). (husman)
    . Fixed bug #63111 (is_callable() lies for abstract static method). (Dmitry)
    . Fixed bug #63093 (Segfault while load extension failed in zts-build).
      (Laruence)


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

Reply via email to