Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext-src/php_swoole_http_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

bool swoole_http_server_onBeforeRequest(swoole::http::Context *ctx);
void swoole_http_server_onAfterResponse(swoole::http::Context *ctx);
bool swoole_http_server_is_ip_cache_enabled(const swoole::Server *server);
void swoole_http_server_populate_ip_and_port(
swoole::Server *server, HashTable *ht, swoole::Connection *conn, swoole::SessionId session_id, bool keepalive);

Expand Down
9 changes: 7 additions & 2 deletions ext-src/swoole_http_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,12 @@ void swoole_http_server_onAfterResponse(HttpContext *ctx) {
}
}

// the addresses of a keep-alive session stay cached until php_swoole_http_server_onClose() erases them
// so cache them only when the close event of the session reaches the same worker
bool swoole_http_server_is_ip_cache_enabled(const Server *server) {
return server->is_base_mode() || (server->is_process_mode() && server->dispatch_mode == Server::DISPATCH_FDMOD);
}

/**
* When calculating the server-side IP and client-side IP, since these two calculations
* share the same memory block, they cannot be performed simultaneously; otherwise,
Expand Down Expand Up @@ -481,8 +487,7 @@ void swoole_http_server_populate_ip_and_port(
http_server_add_server_array(ht, SW_ZSTR_KNOWN(SW_ZEND_STR_SERVER_ADDR), SW_ZSTR_KNOWN(key));
http_server_add_server_array(ht, SW_ZSTR_KNOWN(SW_ZEND_STR_REMOTE_ADDR), SW_ZSTR_KNOWN(key));
} else {
if (keepalive && (server->is_base_mode() ||
(server->is_process_mode() && server->dispatch_mode == Server::DISPATCH_FDMOD))) {
if (keepalive && swoole_http_server_is_ip_cache_enabled(server)) {
http_server_session_track_ip(
server, ht, conn, session_id, SW_ZSTR_KNOWN(SW_ZEND_STR_SERVER_ADDR), server_ips);
http_server_session_track_ip(
Expand Down
2 changes: 1 addition & 1 deletion ext-src/swoole_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ void ServerObject::on_before_start() {

if (find_http_port) {
serv->onReceive = php_swoole_http_server_onReceive;
if (serv->is_base_mode()) {
if (swoole_http_server_is_ip_cache_enabled(serv)) {
serv->onClose = php_swoole_http_server_onClose;
}
}
Expand Down
66 changes: 66 additions & 0 deletions tests/swoole_http_server/server_addr_released_on_close.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
--TEST--
swoole_http_server: release the cached addresses of keep-alive connections closed by the client in process mode
--SKIPIF--
<?php require __DIR__ . '/../include/skipif.inc'; ?>
--FILE--
<?php
require __DIR__ . '/../include/bootstrap.php';

use Swoole\Coroutine\Http\Client;
use Swoole\Http\Request;
use Swoole\Http\Response;
use Swoole\Http\Server;

const N = 500;

$ips = get_server_ips();

$pm = new ProcessManager;
$pm->parentFunc = function () use ($pm, $ips) {
Co\run(function () use ($pm, $ips) {
// the server closes these connections so it does not cache their addresses
$memory = function () use ($pm, $ips): int {
return (int) httpGetBody("http://{$ips[1]}:{$pm->getFreePort()}/memory", [
'headers' => ['Connection' => 'close'],
]);
};
$before = $memory();
for ($i = 0; $i < N; $i++) {
$client = new Client($ips[1], $pm->getFreePort());
Assert::true($client->get('/'));
Assert::eq($client->body, $ips[1]);
$client->close();
}
// let the worker handle the close events
Co::sleep(0.5);
$after = $memory();
// a connection that keeps both cached addresses holds at least 64 bytes
Assert::lessThan($after - $before, N * 16);
});
$pm->kill();
echo "DONE\n";
};

$pm->childFunc = function () use ($pm) {
$http = new Server('0.0.0.0', $pm->getFreePort(), SWOOLE_PROCESS);
$http->set([
'worker_num' => 1,
'log_file' => '/dev/null',
]);
$http->on('workerStart', function () use ($pm) {
$pm->wakeup();
});
$http->on('request', function (Request $request, Response $response) {
if ($request->server['request_uri'] === '/memory') {
$response->end((string) memory_get_usage());
} else {
$response->end($request->server['remote_addr']);
}
});
$http->start();
};
$pm->childFirst();
$pm->run();
?>
--EXPECT--
DONE