diff --git a/examples/run_test.sh b/examples/run_test.sh index e522747d..e585f3ad 100755 --- a/examples/run_test.sh +++ b/examples/run_test.sh @@ -1,10 +1,12 @@ #!/usr/bin/env bash - +echo sse_server 1>&2 PORT=8082 ./sse_server.exe -p $PORT & +PID=$! + sleep 0.1 ./sse_client.exe -p $PORT --alarm=1 /count | tr -d '\r' || true -kill %1 +kill $PID echo "success" diff --git a/src/bin/http_of_dir.ml b/src/bin/http_of_dir.ml index b7aa3108..d2cf3481 100644 --- a/src/bin/http_of_dir.ml +++ b/src/bin/http_of_dir.ml @@ -115,7 +115,6 @@ let date_of_time (f:float) : string = let serve ~config (dir:string) : _ result = let server = S.create ~max_connections:config.j - ~max_keep_alive:config.max_keep_alive ~addr:config.addr ~port:config.port () in Printf.printf "serve directory %s on http://%(%s%):%d\n%!" dir (if S.is_ipv6 server then "[%s]" else "%s") config.addr config.port; diff --git a/tests/download_chunked.sh b/tests/download_chunked.sh index 6d8cbde6..0072f711 100755 --- a/tests/download_chunked.sh +++ b/tests/download_chunked.sh @@ -1,13 +1,14 @@ #!/usr/bin/env sh +echo download_chunked 1>&2 SERVER=$1 PORT=8084 "$SERVER" . -p $PORT & - +PID=$! sleep 0.1 curl -N "http://localhost:${PORT}/foo_50" -o data2 \ -H 'Tranfer-encoding: chunked' -kill %1 +kill $PID wc data2 diff --git a/tests/echo1.sh b/tests/echo1.sh index 5cad7b60..aee93450 100755 --- a/tests/echo1.sh +++ b/tests/echo1.sh @@ -1,9 +1,11 @@ #!/usr/bin/env sh +echo echo1 1>&2 ECHO=$1 PORT=8085 "$ECHO" -p $PORT & +PID=$! sleep 0.1 curl -N "http://localhost:${PORT}/echo/?a=b&c=d" -H user-agent:test -kill %1 +kill $PID diff --git a/tests/sse_count.sh b/tests/sse_count.sh index 6010ed37..473f5116 100755 --- a/tests/sse_count.sh +++ b/tests/sse_count.sh @@ -1,10 +1,12 @@ #!/usr/bin/env sh +echo see_count 1>&2 SSE_SERVER=$1 PORT=8086 "$SSE_SERVER" -p $PORT & +PID=$! sleep 0.1 curl -N "http://localhost:${PORT}/count/10" -H user-agent:test -kill %1 +kill $PID diff --git a/tests/upload_chunked.sh b/tests/upload_chunked.sh index ca64ac8a..65b192a5 100755 --- a/tests/upload_chunked.sh +++ b/tests/upload_chunked.sh @@ -1,4 +1,5 @@ #!/usr/bin/env sh +echo upload_chunked 1>&2 rm data @@ -6,10 +7,11 @@ SERVER=$1 PORT=8087 "$SERVER" . -p $PORT --upload --max-upload 100000000000 & +PID=$! sleep 0.1 cat foo_50 | curl -N -X PUT http://localhost:$PORT/data --data-binary @- -H 'Transfer-Encoding: chunked' -kill %1 +kill $PID wc data