Permalink
Browse files

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e3
  Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e3
  Fix bug #111 (compile error without ZEND_SIGNALS)
  Don't run travis against master (phpng)
  Update README.md
  • Loading branch information...
remicollet committed Sep 15, 2014
2 parents 32c46f4 + a390d57 commit 06f8879017151f4993d2e369815b1223cb72af94
Showing with 6 additions and 7 deletions.
  1. +0 −1 sapi/phpdbg/.travis.yml
  2. +1 −1 sapi/phpdbg/README.md
  3. +5 −5 sapi/phpdbg/phpdbg.c
@@ -4,7 +4,6 @@ env:
- PHP="PHP-5.4"
- PHP="PHP-5.5"
- PHP="PHP-5.6"
- PHP="master"

before_script: ./travis/ci.sh

@@ -1,7 +1,7 @@
The interactive PHP debugger
============================

Implemented as a SAPI module, phpdbg can excert complete control over the environment without impacting the functionality or performance of your code.
Implemented as a SAPI module, phpdbg can exert complete control over the environment without impacting the functionality or performance of your code.

phpdbg aims to be a lightweight, powerful, easy to use debugging platform for PHP 5.4+

@@ -1296,14 +1296,14 @@ int main(int argc, char **argv) /* {{{ */

/* do not install sigint handlers for remote consoles */
/* sending SIGINT then provides a decent way of shutting down the server */
#if defined(ZEND_SIGNALS) && !defined(_WIN32)
if (listen[0] < 0) {
zend_try { zend_signal(SIGINT, phpdbg_sigint_handler TSRMLS_CC); } zend_end_try();
}
#elif !defined(_WIN32)
#ifndef _WIN32
if (listen[0] < 0) {
#endif
#if defined(ZEND_SIGNALS) && !defined(_WIN32)
zend_try { zend_signal(SIGINT, phpdbg_sigint_handler TSRMLS_CC); } zend_end_try();
#else
signal(SIGINT, phpdbg_sigint_handler);
#endif
#ifndef _WIN32
}
#endif

0 comments on commit 06f8879

Please sign in to comment.