]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32c46f4 a390d57)
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 15 Sep 2014 06:28:22 +0000 (08:28 +0200)
committerRemi Collet <remi@php.net>
Mon, 15 Sep 2014 06:28:22 +0000 (08:28 +0200)
* PHP-5.6:
  Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8b303945945c650d4bc90dcc2ac0b17
  Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8b303945945c650d4bc90dcc2ac0b17
  Fix bug #111 (compile error without ZEND_SIGNALS)
  Don't run travis against master (phpng)
  Update README.md

1  2 
sapi/phpdbg/phpdbg.c patch | diff1 | diff2 | blob | history

diff --cc sapi/phpdbg/phpdbg.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.