From: Xinchen Hui <laruence@php.net>
Date: Thu, 18 Oct 2012 09:32:48 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha1~24^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54cef2bb6d4d0527ac161b900b0b475d2ce312fb;p=php

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

54cef2bb6d4d0527ac161b900b0b475d2ce312fb
diff --cc NEWS
index eca66987eb,009f082bd0..49980d1919
--- 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.chevrel@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 (lonny@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)