Mercurial > hg > nginx-ranges

comparison src/http/modules/ngx_http_memcached_module.c @ 578:f3a9e57d2e17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents 2da4537168f8
children be4f34123024
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
59 { ngx_string("memcached_pass"), 59 { ngx_string("memcached_pass"),
60 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1, 60 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
61 ngx_http_memcached_pass, 61 ngx_http_memcached_pass,
62 NGX_HTTP_LOC_CONF_OFFSET, 62 NGX_HTTP_LOC_CONF_OFFSET,
63 0, 63 0,
64 NULL },
65
66 { ngx_string("memcached_bind"),
67 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
68 ngx_http_upstream_bind_set_slot,
69 NGX_HTTP_LOC_CONF_OFFSET,
70 offsetof(ngx_http_memcached_loc_conf_t, upstream.local),
64 NULL }, 71 NULL },
65 72
66 { ngx_string("memcached_connect_timeout"), 73 { ngx_string("memcached_connect_timeout"),
67 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 74 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
68 ngx_conf_set_msec_slot, 75 ngx_conf_set_msec_slot,