Mercurial > hg > nginx

changeset 5213:822b82191940

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream keepalive: slightly simplified code.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 15 May 2013 15:04:49 +0400
parents 09dbd363050a
children 2220de0521ca
files src/http/modules/ngx_http_upstream_keepalive_module.c
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -81,7 +81,7 @@ static ngx_command_t  ngx_http_upstream_
     { ngx_string("keepalive"),
       NGX_HTTP_UPS_CONF|NGX_CONF_TAKE12,
       ngx_http_upstream_keepalive,
-      0,
+      NGX_HTTP_SRV_CONF_OFFSET,
       0,
       NULL },
 
@@ -481,7 +481,7 @@ static char *
 ngx_http_upstream_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_http_upstream_srv_conf_t            *uscf;
-    ngx_http_upstream_keepalive_srv_conf_t  *kcf;
+    ngx_http_upstream_keepalive_srv_conf_t  *kcf = conf;
 
     ngx_int_t    n;
     ngx_str_t   *value;
@@ -489,9 +489,6 @@ ngx_http_upstream_keepalive(ngx_conf_t *
 
     uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);
 
-    kcf = ngx_http_conf_upstream_srv_conf(uscf,
-                                          ngx_http_upstream_keepalive_module);
-
     if (kcf->original_init_upstream) {
         return "is duplicate";
     }