]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1e32a4 db537b1)
Merge branch 'pull-request/694' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Sun, 29 Jun 2014 22:51:59 +0000 (00:51 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sun, 29 Jun 2014 22:51:59 +0000 (00:51 +0200)
* pull-request/694:
  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.