]> granicus.if.org Git - php/commit
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)
commitd96de86b5b4ca8adf63ac6e07ab57fc2ec9d87f4
treee07df6e72de5a9923100cfdc9950d3e4407c663a
parentb1e32a4f7a6c2351a2006c2c1b9085336ba513e4
parentdb537b1f3f75d39505964a055418932ac3067f40
Merge branch 'pull-request/694' into PHP-5.6

* pull-request/694:
  Fix SetHandler proxy:fcgi:// incompatibilities
sapi/fpm/fpm/fpm_main.c