Commit:    80a9a80a52d1eb0281cd2894be05c685e4d526a0
Author:    Stanislav Malyshev <s...@php.net>         Tue, 1 Jan 2013 21:20:35 
-0800
Parents:   343a9199bbbf4f63b02099ceef27ef9881d8aa9f 
36e19c9cab6cce4e44782563f590c6c4560fb187
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and 
return code should not be affected.
  fix NEWS

Conflicts:
        main/main.c

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

Changed paths:
  MM  Zend/zend.c
  MM  main/main.c


Diff:



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

Reply via email to