s

php · Nov 25, 2014 · 2e0db17 · 2e0db17
1 parent 4f76531
commit 2e0db17
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
@@ -1555,7 +1555,7 @@ static inline void fcgi_hash_apply(HashTable *h, fcgi_apply_func func, void *arg
 	while (p) {
 		if (EXPECTED(p->arKey != NULL)) {
 			/* Since request->env already has the terminating char, -1 to var_len */
-			func((char*)p->arKey, p->nKeyLength-1, *(char**)p->pData, strlen(*(char**)p->pData), arg TSRMLS_CC);
+			func((char*)p->arKey, p->nKeyLength, *(char**)p->pData, strlen(*(char**)p->pData), arg TSRMLS_CC);
 		}
 		p = p->pListNext;
 	}

diff --git a/sapi/fpm/tests/018.phpt b/sapi/fpm/tests/018.phpt
@@ -35,8 +35,11 @@ $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
     fpm_display_log($tail, 2);
     try {
-		$headers = ['HTTP_X_TEST' => 'Pass'];
-		$req = run_request('127.0.0.1', $port, $srcfile, '', $headers);
+		$headers = [
+			'HTTP_X_FOO' => 'BAR',
+			'HTTP_CONTENT_TYPE' => 'text/html; charset=UTF-8',
+		];
+		$req = run_request('127.0.0.1', $port, $srcfile, '');
 		echo strstr($req, "Test Start");
 		echo "Request ok\n";
 	} catch (Exception $e) {
@@ -55,8 +58,8 @@ Done
 [%s] NOTICE: ready to handle connections
 Test Start
 array(1) {
-  ["X-Test"]=>
-  string(4) "Pass"
+  ["X-Foo"]=>
+  string(4) "Bar"
 }
 Test End