nginx: src/http/ngx_http_upstream.c comparison

Upstream: max_conns.

comparison

equal deleted inserted replaced

-:a44ba757851d
+:29bf0dbc0a77
 u.no_resolve = 1;
 u.no_port = 1;
 uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE
 |NGX_HTTP_UPSTREAM_WEIGHT
+|NGX_HTTP_UPSTREAM_MAX_CONNS
 |NGX_HTTP_UPSTREAM_MAX_FAILS
 |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
 |NGX_HTTP_UPSTREAM_DOWN
 |NGX_HTTP_UPSTREAM_BACKUP);
 if (uscf == NULL) {
 ngx_http_upstream_srv_conf_t  *uscf = conf;
 time_t                       fail_timeout;
 ngx_str_t                   *value, s;
 ngx_url_t                    u;
-ngx_int_t                    weight, max_fails;
+ngx_int_t                    weight, max_conns, max_fails;
 ngx_uint_t                   i;
 ngx_http_upstream_server_t  *us;
 us = ngx_array_push(uscf->servers);
 if (us == NULL) {
 ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
 value = cf->args->elts;
 weight = 1;
+max_conns = 0;
 max_fails = 1;
 fail_timeout = 10;
 for (i = 2; i < cf->args->nelts; i++) {
 }
 weight = ngx_atoi(&value[i].data[7], value[i].len - 7);
 if (weight == NGX_ERROR || weight == 0) {
+goto invalid;
+}
+continue;
+}
+if (ngx_strncmp(value[i].data, "max_conns=", 10) == 0) {
+if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_CONNS)) {
+goto not_supported;
+}
+max_conns = ngx_atoi(&value[i].data[10], value[i].len - 10);
+if (max_conns == NGX_ERROR) {
 goto invalid;
 }
 continue;
 }
 us->name = u.url;
 us->addrs = u.addrs;
 us->naddrs = u.naddrs;
 us->weight = weight;
+us->max_conns = max_conns;
 us->max_fails = max_fails;
 us->fail_timeout = fail_timeout;
 return NGX_CONF_OK;

Mercurial > hg > nginx