commit f8a6de481c9af7e7f0c0d2ab0e406e3804b8fc1c
author Ruslan Ermilov <ru@nginx.com> Wed Dec 26 14:46:06 2012 +0000
committer Ruslan Ermilov <ru@nginx.com> Wed Dec 26 14:46:06 2012 +0000
tree c8a0d22707f9de2c6a399ef01b9264d4fc09f6c7
parent 0a668faba4953eed082417f1d78b1a97f73a1ebe

Upstream keepalive: detect duplicate "keepalive" directive.

A failure to detect duplicate "keepalive" directive resulted in
stack exhaustion.

src/http/modules/ngx_http_upstream_keepalive_module.c

diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index d10e3d0..a2ad5aa 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -502,6 +502,10 @@
     kcf = ngx_http_conf_upstream_srv_conf(uscf,
                                           ngx_http_upstream_keepalive_module);
 
+    if (kcf->original_init_upstream) {
+        return "is duplicate";
+    }
+
     kcf->original_init_upstream = uscf->peer.init_upstream
                                   ? uscf->peer.init_upstream
                                   : ngx_http_upstream_init_round_robin;