summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-07-09 14:07:37 +0400
committerDmitry Stogov <dmitry@zend.com>2014-07-09 14:07:37 +0400
commitf2a12d65fdc65079402660809641c67ae3837b8d (patch)
tree6d95c5c0b1a8e4cdd3d74fce9720aaad73bda328 /Zend/zend_execute_API.c
parentd87140d8d8a76dddc3501306d0da901c1ae2cd61 (diff)
parent25fe17bdcd3e88adc4a2b020113a7bacf343cf7d (diff)
downloadphp-git-f2a12d65fdc65079402660809641c67ae3837b8d.tar.gz
Merge branch 'master' into phpng
* master: 5.4.31 update NEWS fix unstable test 5.5.16 now fix unstable test Fix bug #67587: Redirection loop on nginx with FPM Fix bug #67587: Redirection loop on nginx with FPM Fix bug #67587: Redirection loop on nginx with FPM updated NEWS updated NEWS updated NEWS Backported the patch from bug #67407 into 5.5+ Backported the patch from bug #67407 into 5.4 NEWS 5.6 have fpm_globals.force_stderr Fix Bug #67530 error_log=syslog ignored NEWS NEWS Fix Bug #67530 error_log=syslog ignored Update info.c
Diffstat (limited to 'Zend/zend_execute_API.c')
0 files changed, 0 insertions, 0 deletions