Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  FPM: add test for CVE-2016-5385

diff --cc sapi/fpm/tests/include.inc
index 5cbb08b4786a31368ee74fe7d6c34e4be3745d84,a8b64f48b7eac0643e1ee83b1c8770bcd0e1a573..7c5011213b74ed731d3cf29cbf0ef385a642c266
--- 1/sapi/fpm/tests/include.inc
--- 2/sapi/fpm/tests/include.inc
+++ b/sapi/fpm/tests/include.inc
@@@ -96,12 -84,12 +96,12 @@@ function fpm_display_log($tail, $n=1, $
                        $n--;
                }
        }
 -}
 +} /* }}} */
  
- function run_request($host, $port, $uri='/ping', $query='') { /* {{{ */
 -function run_request($host, $port, $uri='/ping', $query='', $headers=array()) {
++function run_request($host, $port, $uri='/ping', $query='', $headers=array()) {  /* {{{ */
        require_once 'fcgi.inc';
        $client = new Adoy\FastCGI\Client($host, $port);
-       $params = array(
+       $params = array_merge(array(
                'GATEWAY_INTERFACE' => 'FastCGI/1.0',
                'REQUEST_METHOD'    => 'GET',
                'SCRIPT_FILENAME'   => $uri,
@@@ -118,7 -106,6 +118,7 @@@
                'SERVER_PROTOCOL'   => 'HTTP/1.1',
                'CONTENT_TYPE'      => '',
                'CONTENT_LENGTH'    => 0
-       );
+       ), $headers);
        return $client->request($params, false)."\n";
  }
 +/* }}} */