com php-src: Merge branch 'pull-request/694' into PHP-5.6: sapi/fpm/fpm/fpm_main.c
| From: | Ferenc Kovacs | Date: | Sun, 29 Jun 2014 22:51:59 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/694' into PHP-5.6: sapi/fpm/fpm/fpm_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79136@lists.php.net to get a copy of this message | ||
Commit: d96de86b5b4ca8adf63ac6e07ab57fc2ec9d87f4
Author: Ferenc Kovacs <tyrael@php.net> Mon, 30 Jun 2014 00:51:59 +0200
Parents: b1e32a4f7a6c2351a2006c2c1b9085336ba513e4 db537b1f3f75d39505964a055418932ac3067f40
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=d96de86b5b4ca8adf63ac6e07ab57fc2ec9d87f4
Log:
Merge branch 'pull-request/694' into PHP-5.6
* pull-request/694:
Fix SetHandler proxy:fcgi:// incompatibilities
Changed paths:
MM sapi/fpm/fpm/fpm_main.c
Diff: