Mercurial > hg > nginx-vendor-current

diff src/imap/ngx_imap_auth_http_module.c @ 258:6ae1357b7b7c NGINX_0_4_14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.4.14 *) Feature: the "proxy_pass_error_message" directive in IMAP/POP3 proxy. *) Feature: now configure detects system PCRE library on FreeBSD, Linux, and NetBSD. *) Bugfix: ngx_http_perl_module did not work with perl built with the threads support; bug appeared in 0.3.38. *) Bugfix: ngx_http_perl_module did not work if perl was called recursively. *) Bugfix: nginx ignored a host name in an request line. *) Bugfix: a worker process may got caught in an endless loop, if a FastCGI server sent too many data to the stderr. *) Bugfix: the $upstream_response_time variable may be negative if the system time was changed backward. *) Bugfix: the "Auth-Login-Attempt" parameter was not sent to IMAP/POP3 proxy authentication server when POP3 was used. *) Bugfix: a segmentation fault might occur if connect to IMAP/POP3 proxy authentication server failed.
author Igor Sysoev <http://sysoev.ru>
date Mon, 27 Nov 2006 00:00:00 +0300
parents 644510700914
children 0effe91f6083
line wrap: on
line diff
--- a/src/imap/ngx_imap_auth_http_module.c
+++ b/src/imap/ngx_imap_auth_http_module.c
@@ -182,7 +182,10 @@ ngx_imap_auth_http_init(ngx_imap_session
     rc = ngx_event_connect_peer(&ctx->peer);
 
     if (rc == NGX_ERROR || rc == NGX_BUSY || rc == NGX_DECLINED) {
-        ngx_close_connection(ctx->peer.connection);
+        if (ctx->peer.connection) {
+            ngx_close_connection(ctx->peer.connection);
+        }
+
         ngx_destroy_pool(ctx->pool);
         ngx_imap_session_internal_server_error(s);
         return;
@@ -489,10 +492,10 @@ ngx_imap_auth_http_process_headers(ngx_i
                 ctx->errmsg.data = ctx->header_start;
 
                 if (s->protocol == NGX_IMAP_POP3_PROTOCOL) {
-                    size = sizeof("-ERR") - 1 + len + sizeof(CRLF) - 1;
+                    size = sizeof("-ERR ") - 1 + len + sizeof(CRLF) - 1;
 
                 } else {
-                    size = s->tag.len + sizeof("NO") - 1 + len
+                    size = s->tag.len + sizeof("NO ") - 1 + len
                            + sizeof(CRLF) - 1;
                 }
 
@@ -1039,7 +1042,9 @@ ngx_imap_auth_http_create_request(ngx_im
 
     len = sizeof("GET ") - 1 + ahcf->uri.len + sizeof(" HTTP/1.0" CRLF) - 1
           + sizeof("Host: ") - 1 + ahcf->host_header.len + sizeof(CRLF) - 1
-          + sizeof("Auth-Method: plain" CRLF) - 1
+          + sizeof("Auth-Method: ") - 1
+                + ngx_imap_auth_http_method[s->auth_method].len
+                + sizeof(CRLF) - 1
           + sizeof("Auth-User: ") - 1 + login.len + sizeof(CRLF) - 1
           + sizeof("Auth-Pass: ") - 1 + passwd.len + sizeof(CRLF) - 1
           + sizeof("Auth-Salt: ") - 1 + s->salt.len