]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fd4a738 914de05)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Fri, 13 Dec 2013 07:15:38 +0000 (11:15 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 13 Dec 2013 07:15:38 +0000 (11:15 +0400)
commit9b829c92b5b28af00510b6cfe708ea90184f8381
tree85f821ffe6f980cd3d591df01e09e451944c4f76tree | snapshot
parentfd4a7388d781cab1782178ee4984a21183ee9af5commit | diff
parent914de05bf59ba91d39b6b3f3e914fd2a456d0133commit | diff
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Kill another TSRMLS_FETCH() in zend_indent()
  Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
  Fix build
  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).
Unnamed repository; edit this file 'description' to name the repository.