From c15717285d2157a603bb1b130b26d7baa549be7e Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sat, 19 Mar 2005 12:38:37 +0000 Subject: nginx-0.1.25-RELEASE import *) Bugfix: nginx did run on Linux parisc. *) Feature: nginx now does not start under FreeBSD if the sysctl kern.ipc.somaxconn value is too big. *) Bugfix: if a request was internally redirected by the ngx_http_index_module module to the ngx_http_proxy_module or ngx_http_fastcgi_module modules, then the index file was not closed after request completion. *) Feature: the "proxy_pass" can be used in location with regular expression. *) Feature: the ngx_http_rewrite_filter_module module supports the condition like "if ($HTTP_USER_AGENT ~ MSIE)". *) Bugfix: nginx started too slow if the large number of addresses and text values were used in the "geo" directive. *) Change: a variable name must be declared as "$name" in the "geo" directive. The previous variant without "$" is still supported, but will be removed soon. *) Feature: the "%{VARIABLE}v" logging parameter. *) Feature: the "set $name value" directive. *) Bugfix: gcc 4.0 compatibility. *) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive. --- src/imap/ngx_imap_handler.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/imap/ngx_imap_handler.c') diff --git a/src/imap/ngx_imap_handler.c b/src/imap/ngx_imap_handler.c index 4d9e93a28..371d77f8e 100644 --- a/src/imap/ngx_imap_handler.c +++ b/src/imap/ngx_imap_handler.c @@ -17,7 +17,9 @@ static ngx_int_t ngx_pop3_read_command(ngx_imap_session_t *s); static u_char pop3_greeting[] = "+OK " NGINX_VER " ready" CRLF; +#if 0 static u_char imap_greeting[] = "* OK " NGINX_VER " ready" CRLF; +#endif static u_char pop3_ok[] = "+OK" CRLF; static u_char pop3_invalid_command[] = "-ERR invalid command" CRLF; @@ -69,7 +71,8 @@ static void ngx_imap_init_session(ngx_event_t *rev) return; } - if (!(s = ngx_pcalloc(c->pool, sizeof(ngx_imap_session_t)))) { + s = ngx_pcalloc(c->pool, sizeof(ngx_imap_session_t)); + if (s == NULL) { ngx_imap_close_connection(c); return; } @@ -307,5 +310,5 @@ void ngx_imap_close_connection(ngx_connection_t *c) ngx_close_connection(c); - ngx_destroy_pool(c->pool); + ngx_destroy_pool(pool); } -- cgit v1.2.3