On Fri, 29 Nov 2013, Dmitry Stogov wrote:

> Commit:    967abd61537a2c7d0beebac9039aa068d518e4eb
> Author:    Dmitry Stogov <dmi...@zend.com>         Fri, 29 Nov 2013 12:54:22 
> +0400
> Parents:   b0d24d3d2001ad3bfe6b9a2e66cb631ae49b4064 
> 2d31eadbbf147a157cb4a0c89adaf30fee7371f0
> Branches:  PHP-5.5 PHP-5.6 master
> 
> Link:       
> http://git.php.net/?p=php-src.git;a=commitdiff;h=967abd61537a2c7d0beebac9039aa068d518e4eb
> 
> Log:
> Merge branch 'PHP-5.4' into PHP-5.5
> 
> * PHP-5.4:
>   Added validation of class names in the autoload process
> 
> Changed paths:
>   MM  NEWS

THis seems to have changed/messed up the NEWS file?

cheers,
Derick


>   MM  Zend/zend_execute_API.c
> 
> 
> Diff:
> diff --cc NEWS
> index b3c8adf,f55ff05..d16e8bd
> --- a/NEWS
> +++ b/NEWS
> @@@ -1,16 -1,17 +1,19 @@@
>   PHP                                                                        
> NEWS
>   
> |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
>  -?? ??? 2013, PHP 5.4.24
>  +?? ??? 2013, PHP 5.5.8
>   
> + - Core:
> +   . Added validation of class names in the autoload process. (Dmitry)
> + 
>   - Date:
>     . Fixed bug #66060 (Heap buffer over-read in DateInterval). (Remi)
>  -  . Fixed bug #63391 (Incorrect/inconsistent day of week prior to the year
>  -    1600). (Derick, T. Carter)
>  -  . Fixed bug #61599 (Wrong Day of Week). (Derick, T. Carter)
>   
>  -?? ??? 2013, PHP 5.4.23
>  +?? ??? 2013, PHP 5.5.7
>  +
>  +- CLI server:
>  +  . Added some MIME types to the CLI web server (Chris Jones)
>  +  . Implemented FR #65917 (getallheaders() is not supported by the built-in 
> web
>  +    server) - also implements apache_response_headers() (Andrea Faulds)
>   
>   - Core:
>     . Fixed bug #66094 (unregister_tick_function tries to cast a Closure to a
> 
> 
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
> 

-- 
http://derickrethans.nl | http://xdebug.org
Like Xdebug? Consider a donation: http://xdebug.org/donate.php
twitter: @derickr and @xdebug
Posted with an email client that doesn't mangle email: alpine

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

Reply via email to