Mercurial > hg > nginx-vendor-current

diff src/imap/ngx_imap.h @ 252:644510700914 NGINX_0_4_11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.4.11 *) Feature: the POP3 proxy supports the AUTH LOGIN PLAIN and CRAM-MD5. *) Feature: the ngx_http_perl_module supports the $r->allow_ranges method. *) Bugfix: if the APOP was enabled in the POP3 proxy, then the USER/PASS commands might not work; bug appeared in 0.4.10.
author Igor Sysoev <http://sysoev.ru>
date Wed, 25 Oct 2006 00:00:00 +0400
parents fbf2b2f66c9f
children 0effe91f6083
line wrap: on
line diff
--- a/src/imap/ngx_imap.h
+++ b/src/imap/ngx_imap.h
@@ -83,6 +83,8 @@ typedef struct {
 
     ngx_str_t               pop3_capability;
     ngx_str_t               pop3_starttls_capability;
+    ngx_str_t               pop3_auth_capability;
+
     ngx_str_t               imap_capability;
     ngx_str_t               imap_starttls_capability;
     ngx_str_t               imap_starttls_only_capability;
@@ -120,7 +122,11 @@ typedef enum {
 typedef enum {
     ngx_pop3_start = 0,
     ngx_pop3_user,
-    ngx_pop3_passwd
+    ngx_pop3_passwd,
+    ngx_pop3_auth_login_username,
+    ngx_pop3_auth_login_password,
+    ngx_pop3_auth_plain,
+    ngx_pop3_auth_cram_md5
 } ngx_po3_state_e;
 
 
@@ -153,7 +159,7 @@ typedef struct {
     unsigned                backslash:1;
     unsigned                no_sync_literal:1;
     unsigned                starttls:1;
-    unsigned                auth_method:1;
+    unsigned                auth_method:2;
 
     ngx_str_t               login;
     ngx_str_t               passwd;
@@ -192,13 +198,14 @@ typedef struct {
 #define NGX_POP3_NOOP        5
 #define NGX_POP3_STLS        6
 #define NGX_POP3_APOP        7
-#define NGX_POP3_STAT        8
-#define NGX_POP3_LIST        9
-#define NGX_POP3_RETR        10
-#define NGX_POP3_DELE        11
-#define NGX_POP3_RSET        12
-#define NGX_POP3_TOP         13
-#define NGX_POP3_UIDL        14
+#define NGX_POP3_AUTH        8
+#define NGX_POP3_STAT        9
+#define NGX_POP3_LIST        10
+#define NGX_POP3_RETR        11
+#define NGX_POP3_DELE        12
+#define NGX_POP3_RSET        13
+#define NGX_POP3_TOP         14
+#define NGX_POP3_UIDL        15
 
 
 #define NGX_IMAP_LOGIN       1
@@ -210,12 +217,14 @@ typedef struct {
 #define NGX_IMAP_NEXT        6
 
 
-#define NGX_IMAP_AUTH_PLAIN  0
-#define NGX_IMAP_AUTH_APOP   1
+#define NGX_IMAP_AUTH_PLAIN     0
+#define NGX_IMAP_AUTH_APOP      1
+#define NGX_IMAP_AUTH_CRAM_MD5  2
 
 
-#define NGX_IMAP_AUTH_PLAIN_ENABLED  0x0002
-#define NGX_IMAP_AUTH_APOP_ENABLED   0x0004
+#define NGX_IMAP_AUTH_PLAIN_ENABLED     0x0002
+#define NGX_IMAP_AUTH_APOP_ENABLED      0x0004
+#define NGX_IMAP_AUTH_CRAM_MD5_ENABLED  0x0008
 
 
 #define NGX_IMAP_PARSE_INVALID_COMMAND  20