Skip to content
Merged
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
4 changes: 2 additions & 2 deletions lightbug_http/server.mojo
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ struct Server(Movable):
fn __init__(
out self,
var address: String = "127.0.0.1",
tcp_keep_alive: Bool = True,
tcp_keep_alive: Bool = False,
):
self.config = ServerConfig()
self._address = address^
Expand All @@ -487,7 +487,7 @@ struct Server(Movable):
out self,
var config: ServerConfig,
var address: String = "127.0.0.1",
tcp_keep_alive: Bool = True,
tcp_keep_alive: Bool = False,
):
self.config = config^
self._address = address^
Expand Down
19 changes: 19 additions & 0 deletions tests/integration/integration_client.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import concurrent.futures
import requests
import socket
import time
Expand Down Expand Up @@ -32,6 +33,24 @@
)
assert response.status_code == 200

print("\n~~~ Testing parallel connections ~~~")
# Browsers open 6+ parallel connections for assets.
# A single-threaded server with keep-alive blocks on conn.read() waiting for
# the next request, preventing other connections from being accepted.
# This test verifies all parallel requests complete within a reasonable time.


def fetch(path):
return requests.get(f"http://127.0.0.1:8080{path}", headers={"connection": "close"})


with concurrent.futures.ThreadPoolExecutor(max_workers=4) as executor:
futures = [executor.submit(fetch, f"/?n={i}") for i in range(4)]
results = concurrent.futures.wait(futures, timeout=5)
assert len(results.done) == 4, f"Only {len(results.done)}/4 parallel requests completed within 5s"
for f in results.done:
assert f.result().status_code == 200

print("\n~~~ Testing content-length mismatch (smaller) ~~~")


Expand Down
2 changes: 1 addition & 1 deletion tests/integration/integration_test_server.mojo
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ struct IntegrationTestService(HTTPService):


fn main() raises:
var server = Server(tcp_keep_alive=True)
var server = Server()
var service = IntegrationTestService()
server.listen_and_serve("127.0.0.1:8080", service)
14 changes: 14 additions & 0 deletions tests/lightbug_http/test_server.mojo
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import testing
from lightbug_http.server import Server


def test_server_defaults_to_keep_alive_off():
var server = Server()
testing.assert_false(
server.tcp_keep_alive,
"tcp_keep_alive must default to False for single-threaded server",
)


def main():
testing.TestSuite.discover_tests[__functions_in_module()]().run()