@@ -329,8 +329,6 @@ queue_check_event(ngx_event_t *ev) , 0 , "max_connections expire" ); - /* use NGX_HTTP_QUEUE_EXPIRATION? seems to be causing memory problems - * test with test/test_queue_timeout.rb */ ngx_http_finalize_request(peer_data->r, NGX_HTTP_INTERNAL_SERVER_ERROR); } max_connections_module.c @@ -1,14 +1,3 @@ -diff -Naur ../nginx-0.6.34/src/http/ngx_http_request.h src/http/ngx_http_request.h ---- ../nginx-0.6.34/src/http/ngx_http_request.h 2008-11-27 15:22:34.000000000 +0100 -+++ src/http/ngx_http_request.h 2009-01-22 12:50:27.000000000 +0100 -@@ -119,6 +119,7 @@ - #define NGX_HTTP_GATEWAY_TIME_OUT 504 - #define NGX_HTTP_INSUFFICIENT_STORAGE 507 - -+#define NGX_HTTP_QUEUE_EXPIRATION 555 - - #define NGX_HTTP_LOWLEVEL_BUFFERED 0xf0 - #define NGX_HTTP_WRITE_BUFFERED 0x10 diff -Naur ../nginx-0.6.34/src/http/ngx_http_upstream.c src/http/ngx_http_upstream.c --- ../nginx-0.6.34/src/http/ngx_http_upstream.c 2008-11-27 15:31:44.000000000 +0100 +++ src/http/ngx_http_upstream.c 2009-01-22 12:50:37.000000000 +0100 patches/nginx-0.6.34.patch @@ -7,7 +7,7 @@ test_nginx(backends, :worker_processes => 1, :queue_timeout => "1s" ) do |nginx| - out = %x{httperf --num-conns 100 --hog --timeout 100 --rate 20 --port #{nginx.port}} + out = %x{httperf --num-conns 200 --hog --timeout 100 --rate 20 --port #{nginx.port}} assert $?.exitstatus == 0 results = httperf_parse_output(out) #assert_equal 100, results["5xx"] test/test_queue_timeout.rb 27ddadbd91711f211e2f1b21a7bfaeb8e2f4d766 Ryan ry@tinyclouds.org http://github.com/ry/nginx-ey-balancer/commit/afccd5c15e10257e675fb56715dd7d63bfcf4ffc afccd5c15e10257e675fb56715dd7d63bfcf4ffc 2009-02-05T18:21:54-08:00 2009-02-05T18:21:54-08:00 remove NGX_HTTP_QUEUE_EXPIRATION from patch 737c0ffb01b4e7712c615c4c726c2622b213633d Ryan ry@tinyclouds.org