Commit:    ed3a2eec9c81687b09d9698887df67b498ca6ecf
Author:    Dmitry Stogov <dmi...@zend.com>         Fri, 21 Sep 2012 14:18:37 
+0400
Parents:   f037ddc85971496f985d0cea540129b9d928bb97 
4db74b7f1981bf19805e815f983c50d93df2c26a
Branches:  PHP-5.4 master

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

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

* PHP-5.3:
  Fixed bug #63111 (is_callable() lies for abstract static method)

Conflicts:
        NEWS

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

Changed paths:
  MM  NEWS
  MM  Zend/zend_API.c


Diff:
diff --cc NEWS
index 0c57e0c,191264b..f5e413e
--- a/NEWS
+++ b/NEWS
@@@ -1,17 -1,9 +1,18 @@@
  PHP                                                                        
NEWS
  
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2012, PHP 5.3.18
 +?? ??? 2012, PHP 5.4.8
 +
 +- CLI server:
 +  . 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:
 +  . 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)
+   . Fixed bug #63111 (is_callable() lies for abstract static method). (Dmitry)
    . Fixed bug #63093 (Segfault while load extension failed in zts-build).
      (Laruence)
    . Fixed bug #62976 (Notice: could not be converted to int when comparing


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

Reply via email to