comparison src/imap/ngx_imap_core_module.c @ 88:e916a291e9aa NGINX_0_1_44

nginx 0.1.44 *) Feature: the IMAP/POP3 proxy supports SSL. *) Feature: the "proxy_timeout" directive of the ngx_imap_proxy_module. *) Feature: the "userid_mark" directive. *) Feature: the $remote_user variable value is determined independently of authorization use.
author Igor Sysoev <http://sysoev.ru>
date Tue, 06 Sep 2005 00:00:00 +0400
parents da9a3b14312d
children 71c46860eb55
comparison
equal deleted inserted replaced
87:5b7ec80c3c40 88:e916a291e9aa
73 ngx_conf_set_size_slot, 73 ngx_conf_set_size_slot,
74 NGX_IMAP_SRV_CONF_OFFSET, 74 NGX_IMAP_SRV_CONF_OFFSET,
75 offsetof(ngx_imap_core_srv_conf_t, imap_client_buffer_size), 75 offsetof(ngx_imap_core_srv_conf_t, imap_client_buffer_size),
76 NULL }, 76 NULL },
77 77
78 { ngx_string("proxy_buffer"),
79 NGX_IMAP_MAIN_CONF|NGX_IMAP_SRV_CONF|NGX_CONF_TAKE1,
80 ngx_conf_set_size_slot,
81 NGX_IMAP_SRV_CONF_OFFSET,
82 offsetof(ngx_imap_core_srv_conf_t, proxy_buffer_size),
83 NULL },
84
85 { ngx_string("timeout"), 78 { ngx_string("timeout"),
86 NGX_IMAP_MAIN_CONF|NGX_IMAP_SRV_CONF|NGX_CONF_TAKE1, 79 NGX_IMAP_MAIN_CONF|NGX_IMAP_SRV_CONF|NGX_CONF_TAKE1,
87 ngx_conf_set_msec_slot, 80 ngx_conf_set_msec_slot,
88 NGX_IMAP_SRV_CONF_OFFSET, 81 NGX_IMAP_SRV_CONF_OFFSET,
89 offsetof(ngx_imap_core_srv_conf_t, timeout), 82 offsetof(ngx_imap_core_srv_conf_t, timeout),
155 if (cscf == NULL) { 148 if (cscf == NULL) {
156 return NULL; 149 return NULL;
157 } 150 }
158 151
159 cscf->imap_client_buffer_size = NGX_CONF_UNSET_SIZE; 152 cscf->imap_client_buffer_size = NGX_CONF_UNSET_SIZE;
160 cscf->proxy_buffer_size = NGX_CONF_UNSET_SIZE;
161 cscf->timeout = NGX_CONF_UNSET_MSEC; 153 cscf->timeout = NGX_CONF_UNSET_MSEC;
162 cscf->protocol = NGX_CONF_UNSET_UINT; 154 cscf->protocol = NGX_CONF_UNSET_UINT;
163 155
164 if (ngx_array_init(&cscf->pop3_capabilities, cf->pool, 4, sizeof(ngx_str_t)) 156 if (ngx_array_init(&cscf->pop3_capabilities, cf->pool, 4, sizeof(ngx_str_t))
165 != NGX_OK) 157 != NGX_OK)
188 ngx_str_t *c, *d; 180 ngx_str_t *c, *d;
189 ngx_uint_t i; 181 ngx_uint_t i;
190 182
191 ngx_conf_merge_size_value(conf->imap_client_buffer_size, 183 ngx_conf_merge_size_value(conf->imap_client_buffer_size,
192 prev->imap_client_buffer_size, 184 prev->imap_client_buffer_size,
193 (size_t) ngx_pagesize);
194 ngx_conf_merge_size_value(conf->proxy_buffer_size, prev->proxy_buffer_size,
195 (size_t) ngx_pagesize); 185 (size_t) ngx_pagesize);
196 ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000); 186 ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000);
197 ngx_conf_merge_unsigned_value(conf->protocol, prev->protocol, 187 ngx_conf_merge_unsigned_value(conf->protocol, prev->protocol,
198 NGX_IMAP_IMAP_PROTOCOL); 188 NGX_IMAP_IMAP_PROTOCOL);
199 189