File ngx_max_conn_upstream.diff of Package nginx_0.8_maxconnections

Overview Repositories Revisions Requests Users Attributes Meta

File ngx_max_conn_upstream.diff of Package nginx_0.8_maxconnections

diff -Naur nginx-0.8.43/src/http/ngx_http_upstream.c nginx-0.8.43-diff/src/http/ngx_http_upstream.c
--- nginx-0.8.43/src/http/ngx_http_upstream.c	2010-05-24 16:35:10.000000000 +0400
+++ nginx-0.8.43-diff/src/http/ngx_http_upstream.c	2010-07-05 00:10:46.000000000 +0400
@@ -24,8 +24,6 @@
 static void ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r);
 static void ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
     ngx_event_t *ev);
-static void ngx_http_upstream_connect(ngx_http_request_t *r,
-    ngx_http_upstream_t *u);
 static ngx_int_t ngx_http_upstream_reinit(ngx_http_request_t *r,
     ngx_http_upstream_t *u);
 static void ngx_http_upstream_send_request(ngx_http_request_t *r,
@@ -599,13 +597,12 @@
 
 found:
 
-    if (uscf->peer.init(r, uscf) != NGX_OK) {
-        ngx_http_upstream_finalize_request(r, u,
-                                           NGX_HTTP_INTERNAL_SERVER_ERROR);
-        return;
+    switch(uscf->peer.init(r, uscf)) {
+        case NGX_OK:   ngx_http_upstream_connect(r, u);
+        case NGX_BUSY: return;
     }
 
-    ngx_http_upstream_connect(r, u);
+    ngx_http_upstream_finalize_request(r, u, NGX_HTTP_INTERNAL_SERVER_ERROR);
 }
 
 
@@ -1036,7 +1033,7 @@
 }
 
 
-static void
+void
 ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
 {
     ngx_int_t          rc;
diff -Naur nginx-0.8.43/src/http/ngx_http_upstream.h nginx-0.8.43-diff/src/http/ngx_http_upstream.h
--- nginx-0.8.43/src/http/ngx_http_upstream.h	2010-05-24 15:01:05.000000000 +0400
+++ nginx-0.8.43-diff/src/http/ngx_http_upstream.h	2010-07-05 00:10:46.000000000 +0400
@@ -322,6 +322,8 @@
 
 ngx_int_t ngx_http_upstream_create(ngx_http_request_t *r);
 void ngx_http_upstream_init(ngx_http_request_t *r);
+#define NGX_HTTP_UPSTREAM_INIT_BUSY_PATCH_VERSION  1
+void ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u);
 ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf,
     ngx_url_t *u, ngx_uint_t flags);
 char *ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,

Places

File ngx_max_conn_upstream.diff of Package nginx_0.8_maxconnections

Places