mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream keepalive: slightly simplified code.

Browse Source
This commit is contained in:
Ruslan Ermilov 2013-05-15 15:04:49 +04:00
parent 1f415d6fb9
commit c9c4e39be6
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/http/modules/ngx_http_upstream_keepalive_module.c
View File

@ -81,7 +81,7 @@ static ngx_command_t ngx_http_upstream_keepalive_commands[] = {
{ ngx_string("keepalive"), { ngx_string("keepalive"),
NGX_HTTP_UPS_CONF|NGX_CONF_TAKE12, NGX_HTTP_UPS_CONF|NGX_CONF_TAKE12,
ngx_http_upstream_keepalive, ngx_http_upstream_keepalive,
0, NGX_HTTP_SRV_CONF_OFFSET,
0, 0,
NULL }, NULL },
@ -481,7 +481,7 @@ static char *
ngx_http_upstream_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_http_upstream_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
ngx_http_upstream_srv_conf_t *uscf; 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_int_t n;
ngx_str_t *value; ngx_str_t *value;
@ -489,9 +489,6 @@ ngx_http_upstream_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module); 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) { if (kcf->original_init_upstream) {
return "is duplicate"; return "is duplicate";
} }