]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bddcc1 6f95a07)
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Fri, 13 Dec 2013 07:17:50 +0000 (11:17 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 13 Dec 2013 07:17:50 +0000 (11:17 +0400)
* 'PHP-5.6' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.