Welcome! Log In Create A New Profile

Advanced

[nginx] Upstream keepalive: removed "single" parameter remnants.

Maxim Dounin
September 11, 2014 12:44PM
details: http://hg.nginx.org/nginx/rev/3e5b630e0ec9
branches:
changeset: 5830:3e5b630e0ec9
user: Maxim Dounin <mdounin@mdounin.ru>
date: Thu Sep 11 20:09:04 2014 +0400
description:
Upstream keepalive: removed "single" parameter remnants.

The "single" parameter is deprecated and ignored since 5b5c07dee156 (1.3.2).

diffstat:

src/http/modules/ngx_http_upstream_keepalive_module.c | 21 +------------------
1 files changed, 1 insertions(+), 20 deletions(-)

diffs (44 lines):

diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -79,7 +79,7 @@ static char *ngx_http_upstream_keepalive
static ngx_command_t ngx_http_upstream_keepalive_commands[] = {

{ ngx_string("keepalive"),
- NGX_HTTP_UPS_CONF|NGX_CONF_TAKE12,
+ NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
ngx_http_upstream_keepalive,
NGX_HTTP_SRV_CONF_OFFSET,
0,
@@ -485,7 +485,6 @@ ngx_http_upstream_keepalive(ngx_conf_t *

ngx_int_t n;
ngx_str_t *value;
- ngx_uint_t i;

uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);

@@ -514,23 +513,5 @@ ngx_http_upstream_keepalive(ngx_conf_t *

kcf->max_cached = n;

- for (i = 2; i < cf->args->nelts; i++) {
-
- if (ngx_strcmp(value[i].data, "single") == 0) {
- ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
- "the \"single\" parameter is deprecated");
- continue;
- }
-
- goto invalid;
- }
-
return NGX_CONF_OK;
-
-invalid:
-
- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "invalid parameter \"%V\"", &value[i]);
-
- return NGX_CONF_ERROR;
}

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
Subject Author Views Posted

[nginx] Upstream keepalive: removed "single" parameter remnants.

Maxim Dounin 532 September 11, 2014 12:44PM



Sorry, you do not have permission to post/reply in this forum.

Online Users

Guests: 160
Record Number of Users: 8 on April 13, 2023
Record Number of Guests: 500 on July 15, 2024
Powered by nginx      Powered by FreeBSD      PHP Powered      Powered by MariaDB      ipv6 ready