diff options
author | Ruslan Ermilov <ru@nginx.com> | 2013-01-16 09:42:57 +0000 |
---|---|---|
committer | Ruslan Ermilov <ru@nginx.com> | 2013-01-16 09:42:57 +0000 |
commit | 5d143ca864012d338174f82513bf3b8533de98ab (patch) | |
tree | 647513b22cf369085d12106ba96856373a6fda7b /src/http/modules/ngx_http_memcached_module.c | |
parent | 2aad7d7bb7b31677ce269765f701742141bffd90 (diff) | |
download | nginx-5d143ca864012d338174f82513bf3b8533de98ab.tar.gz nginx-5d143ca864012d338174f82513bf3b8533de98ab.zip |
Fixed and improved the "*_bind" directives of proxying modules.
The "proxy_bind", "fastcgi_bind", "uwsgi_bind", "scgi_bind" and
"memcached_bind" directives are now inherited; inherited value
can be reset by the "off" parameter. Duplicate directives are
now detected. Parameter value can now contain variables.
Diffstat (limited to 'src/http/modules/ngx_http_memcached_module.c')
-rw-r--r-- | src/http/modules/ngx_http_memcached_module.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c index b756c93e5..278b1ed8a 100644 --- a/src/http/modules/ngx_http_memcached_module.c +++ b/src/http/modules/ngx_http_memcached_module.c @@ -574,6 +574,7 @@ ngx_http_memcached_create_loc_conf(ngx_conf_t *cf) * conf->upstream.location = NULL; */ + conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; @@ -607,6 +608,9 @@ ngx_http_memcached_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_http_memcached_loc_conf_t *prev = parent; ngx_http_memcached_loc_conf_t *conf = child; + ngx_conf_merge_ptr_value(conf->upstream.local, + prev->upstream.local, NULL); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); |