From 1765f475445a054994611d2053cc181fb3504615 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 7 Jul 2006 16:33:19 +0000 Subject: nginx-0.3.53-RELEASE import *) Change: the "add_header" directive adds the string to 204, 301, and 302 responses. *) Feature: the "server" directive in the "upstream" context supports the "weight" parameter. *) Feature: the "server_name" directive supports the "*" wildcard. *) Feature: nginx supports the request body size more than 2G. *) Bugfix: if a client was successfully authorized using "satisfy_any on", then anyway the message "access forbidden by rule" was written in the log. *) Bugfix: the "PUT" method may erroneously not create a file and return the 409 code. *) Bugfix: if the IMAP/POP3 backend returned an error, then nginx continued proxying anyway. --- src/imap/ngx_imap_core_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imap/ngx_imap_core_module.c') diff --git a/src/imap/ngx_imap_core_module.c b/src/imap/ngx_imap_core_module.c index c76ad6c67..af50ad6cc 100644 --- a/src/imap/ngx_imap_core_module.c +++ b/src/imap/ngx_imap_core_module.c @@ -205,7 +205,7 @@ ngx_imap_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) prev->imap_client_buffer_size, (size_t) ngx_pagesize); ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000); - ngx_conf_merge_unsigned_value(conf->protocol, prev->protocol, + ngx_conf_merge_uint_value(conf->protocol, prev->protocol, NGX_IMAP_IMAP_PROTOCOL); ngx_conf_merge_value(conf->so_keepalive, prev->so_keepalive, 0); -- cgit