Skip to content

Commit 97ef580

Browse files
fredemmotthhvm-bot
authored andcommitted
Fix default FastCGI interface
Reviewed By: alexeyt Differential Revision: D15567393 fbshipit-source-id: ffab228f689d4ddca9ea4835c70aecf16da2aa9f
1 parent 149c1e1 commit 97ef580

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

Diff for: hphp/runtime/server/fastcgi/fastcgi-server.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ FastCGIServer::FastCGIServer(const std::string &address,
8080
if (useFileSocket) {
8181
sock_addr.setFromPath(address);
8282
} else if (address.empty()) {
83-
sock_addr.setFromLocalPort(port);
83+
sock_addr.setFromHostPort("localhost", port);
84+
assert(sock_addr.isLoopbackAddress());
8485
} else {
8586
sock_addr.setFromHostPort(address, port);
8687
}

Diff for: hphp/test/server/debugger/tests/runTest1.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
function test1Controller($hphpdOutput, $hphpdProcessId, $serverPort) {
66
// Request a page so that the client can debug it.
77
waitForClientToOutput($hphpdOutput, "Waiting for server response");
8-
$url = "http://".php_uname('n').':'.$serverPort.'/test1.php';
98
echo "Requesting test1.php\n";
10-
request(php_uname('n'), $serverPort, 'test1.php', 10); // ignore response
9+
request('localhost', $serverPort, 'test1.php', 10); // ignore response
1110

1211
// Let client run until script quits
1312
waitForClientToOutput($hphpdOutput, "quit");

Diff for: hphp/test/server/fastcgi/tests/authDigestTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function BadAuthDigestTestController($serverPort) {
88
'uri="/test_auth_digest.php", cnonce="MjIyMTg2", nc=00000001, ' .
99
'qop="auth", response="6dfbea52fbf13016476c1879e6436004", ' .
1010
'opaque="cdce8a5c95a1427d74df7acbf41c9ce0"');
11-
var_dump(request(php_uname('n'), $serverPort, "test_auth_digest.php",
11+
var_dump(request('localhost', $serverPort, "test_auth_digest.php",
1212
[], [], $args));
1313
}
1414

@@ -18,7 +18,7 @@ function GoodAuthDigestTestController($serverPort) {
1818
'uri="/test_auth_digest.php", cnonce="MjIyMTg1", nc=00000001, ' .
1919
'qop="auth", response="e544aaed06917adea3e5c74dd49f0e32", ' .
2020
'opaque="cdce8a5c95a1427d74df7acbf41c9ce0"');
21-
var_dump(request(php_uname('n'), $serverPort, "test_auth_digest.php",
21+
var_dump(request('localhost', $serverPort, "test_auth_digest.php",
2222
[], [], $args));
2323
}
2424

Diff for: hphp/test/server/fastcgi/tests/disable_ini_zend_compat.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
require_once('test_base.inc');
77

88
function disableIniZendCompatController($port) {
9-
echo request(php_uname('n'), $port, 'test_disable_ini_zend_compat.php');
9+
echo request('localhost', $port, 'test_disable_ini_zend_compat.php');
1010
}
1111

1212
echo "---Enable Ini Zend Compat ON---\n";

Diff for: hphp/test/server/fastcgi/tests/global_variables_server.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
$path = 'global_variables.php?var=GET&get=1';
2424
$post = array('var' => 'POST', 'post' => 2);
2525
$headers = array('Cookie' => 'var=COOKIE;cookie=3;');
26-
echo request(php_uname('n'), $port, $path, $post, $headers, $extra) . "\n";
26+
echo request('localhost', $port, $path, $post, $headers, $extra) . "\n";
2727
}, $request[0]);
2828
}

Diff for: hphp/test/server/fastcgi/tests/headerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
function headerTestController($serverPort) {
66
$args = array('Authorization' => 'foo');
7-
var_dump(request(php_uname('n'), $serverPort, "test_headers.php",
7+
var_dump(request('localhost', $serverPort, "test_headers.php",
88
[], ['PROXY' => 'foobar'], $args));
99
}
1010

Diff for: hphp/test/server/fastcgi/tests/httpsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
function httpsTestController($serverPort) {
66
$args = array('HTTPS' => '');
7-
var_dump(request(php_uname('n'), $serverPort, "test_https.php",
7+
var_dump(request('localhost', $serverPort, "test_https.php",
88
[], [], $args));
99
}
1010

Diff for: hphp/test/server/fastcgi/tests/invalid.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require_once('test_base.inc');
44

55
function invalidTestController($port) {
6-
$host = php_uname('n');
6+
$host = 'localhost';
77

88
$filename = __DIR__.'/request-doesnotexist.dat';
99
$file = fopen($filename, 'rb');

Diff for: hphp/test/server/util/server_tests.inc

+4-4
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ function startServer(&$serverPort, &$adminPort, &$debugPort, $home, $root,
179179

180180
// Check if the server id is in the expected list of ids.
181181
function checkServerId($serverPort, $expectedIds) {
182-
$host = php_uname('n');
182+
$host = 'localhost';
183183
$r = request($host, $serverPort, "hello.php");
184184
if (preg_match('/Hello, World!(.*+)/', $r ?? '', &$matches)) {
185185
foreach ((array)$expectedIds as $id) {
@@ -217,7 +217,7 @@ function stopServer($adminPort, $serverProc) {
217217

218218
$r = "";
219219
for ($i = 1; $i <= 10; $i++) {
220-
$r = request(php_uname('n'), $adminPort, 'stop?instance-id='.$test_run_id);
220+
$r = request('localhost', $adminPort, 'stop?instance-id='.$test_run_id);
221221
if ($r === "OK") break;
222222
usleep(100000);
223223
}
@@ -286,7 +286,7 @@ function http_request($host, $port, $path, $timeout = 1200, $curl_opts = '') {
286286
$headers = implode(" ", $s);
287287
}
288288
$url = "http://$host:$port/$path";
289-
$host_name = "hphpd.debugger.".php_uname('n');
289+
$host_name = "hphpd.debugger.".\php_uname('n');
290290

291291
$LOG_ROOT = ServerUtilServerTests::$LOG_ROOT;
292292
$test_run_id = ServerUtilServerTests::$test_run_id;
@@ -304,7 +304,7 @@ function requestAll(array $requests, $customArgs = '', $repoArgs = '') {
304304
foreach ($requests as $request) {
305305
$r = is_array($request) ? $request[0] : $request;
306306
echo "Requesting '$r'\n";
307-
var_dump(request(php_uname('n'), $serverPort, $request));
307+
var_dump(request('localhost', $serverPort, $request));
308308
}
309309
},
310310
$customArgs,

0 commit comments

Comments
 (0)