diff src/mail/ngx_mail_auth_http_module.c @ 570:9773720b845e

Merge with 0.8.16.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 26 Sep 2009 01:25:07 +0400
parents d67e93e97b4a f39b9e29530d
children 0b460e61bdcd
line wrap: on
line diff
--- a/src/mail/ngx_mail_auth_http_module.c
+++ b/src/mail/ngx_mail_auth_http_module.c
@@ -139,6 +139,7 @@ ngx_module_t  ngx_mail_auth_http_module 
 static ngx_str_t   ngx_mail_auth_http_method[] = {
     ngx_string("plain"),
     ngx_string("plain"),
+    ngx_string("plain"),
     ngx_string("apop"),
     ngx_string("cram-md5"),
     ngx_string("none")
@@ -770,6 +771,8 @@ ngx_mail_auth_http_process_headers(ngx_m
                 return;
             }
 
+            /* AF_INET only */
+
             sin = ngx_pcalloc(s->connection->pool, sizeof(struct sockaddr_in));
             if (sin == NULL) {
                 ngx_destroy_pool(ctx->pool);
@@ -1299,7 +1302,7 @@ ngx_mail_auth_http_create_conf(ngx_conf_
 
     ahcf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_auth_http_conf_t));
     if (ahcf == NULL) {
-        return NGX_CONF_ERROR;
+        return NULL;
     }
 
     ahcf->timeout = NGX_CONF_UNSET_MSEC;