diff options
author | Dmitry Stogov <dmitry@zend.com> | 2013-12-13 11:15:38 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2013-12-13 11:15:38 +0400 |
commit | 9b829c92b5b28af00510b6cfe708ea90184f8381 (patch) | |
tree | 85f821ffe6f980cd3d591df01e09e451944c4f76 /sapi/cli/php_cli_server.c | |
parent | fd4a7388d781cab1782178ee4984a21183ee9af5 (diff) | |
parent | 914de05bf59ba91d39b6b3f3e914fd2a456d0133 (diff) | |
download | php-git-9b829c92b5b28af00510b6cfe708ea90184f8381.tar.gz |
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).
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions