]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee6bab6 19e5852)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Sun, 29 Jun 2014 23:03:29 +0000 (01:03 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sun, 29 Jun 2014 23:03:29 +0000 (01:03 +0200)
* PHP-5.6:
  adding NEWS entry for the fix for bug #65641
  Fix SetHandler proxy:fcgi:// incompatibilities

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

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