diff options
Diffstat (limited to 'src/imap')
| -rw-r--r-- | src/imap/ngx_imap.h | 4 | ||||
| -rw-r--r-- | src/imap/ngx_imap_proxy_module.c | 46 |
2 files changed, 6 insertions, 44 deletions
diff --git a/src/imap/ngx_imap.h b/src/imap/ngx_imap.h index c42324cf7..fed6852b1 100644 --- a/src/imap/ngx_imap.h +++ b/src/imap/ngx_imap.h @@ -157,10 +157,6 @@ typedef struct { #define NGX_IMAP_PARSE_INVALID_COMMAND 20 -#define NGX_IMAP_PROXY_INVALID 10 -#define NGX_IMAP_PROXY_ERROR 11 - - #define NGX_IMAP_MODULE 0x50414D49 /* "IMAP" */ #define NGX_IMAP_MAIN_CONF 0x02000000 diff --git a/src/imap/ngx_imap_proxy_module.c b/src/imap/ngx_imap_proxy_module.c index bfbcc1cbe..e1cccf122 100644 --- a/src/imap/ngx_imap_proxy_module.c +++ b/src/imap/ngx_imap_proxy_module.c @@ -32,8 +32,8 @@ static char *ngx_imap_proxy_merge_conf(ngx_conf_t *cf, void *parent, void *child); -#define NGX_IMAP_WAIT_OK 0 -#define NGX_IMAP_WAIT_NEXT 1 +#define NGX_IMAP_WAIT_OK 0 +#define NGX_IMAP_WAIT_NEXT 1 static ngx_command_t ngx_imap_proxy_commands[] = { @@ -156,7 +156,6 @@ ngx_imap_proxy_block_read(ngx_event_t *rev) static void ngx_imap_proxy_imap_handler(ngx_event_t *rev) { - char *action; u_char *p; ngx_int_t rc; ngx_str_t line; @@ -194,21 +193,11 @@ ngx_imap_proxy_imap_handler(ngx_event_t *rev) return; } - if (rc == NGX_ERROR || rc == NGX_IMAP_PROXY_INVALID) { + if (rc == NGX_ERROR) { ngx_imap_proxy_internal_server_error(s); return; } - if (rc == NGX_IMAP_PROXY_ERROR) { - s->connection->read->handler = ngx_imap_proxy_handler; - s->connection->write->handler = ngx_imap_proxy_handler; - rev->handler = ngx_imap_proxy_handler; - c->write->handler = ngx_imap_proxy_handler; - - ngx_imap_proxy_handler(c->read); - return; - } - switch (s->imap_state) { case ngx_imap_start: @@ -294,10 +283,8 @@ ngx_imap_proxy_imap_handler(ngx_event_t *rev) ngx_add_timer(s->connection->read, pcf->timeout); ngx_del_timer(c->read); - action = c->log->action; c->log->action = NULL; ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in"); - c->log->action = action; c->log->action = "proxying"; } @@ -307,7 +294,6 @@ ngx_imap_proxy_imap_handler(ngx_event_t *rev) static void ngx_imap_proxy_pop3_handler(ngx_event_t *rev) { - char *action; u_char *p; ngx_int_t rc; ngx_str_t line; @@ -344,21 +330,11 @@ ngx_imap_proxy_pop3_handler(ngx_event_t *rev) return; } - if (rc == NGX_ERROR || rc == NGX_IMAP_PROXY_INVALID) { + if (rc == NGX_ERROR) { ngx_imap_proxy_internal_server_error(s); return; } - if (rc == NGX_IMAP_PROXY_ERROR) { - s->connection->read->handler = ngx_imap_proxy_handler; - s->connection->write->handler = ngx_imap_proxy_handler; - rev->handler = ngx_imap_proxy_handler; - c->write->handler = ngx_imap_proxy_handler; - - ngx_imap_proxy_handler(c->read); - return; - } - switch (s->imap_state) { case ngx_pop3_start: @@ -425,10 +401,8 @@ ngx_imap_proxy_pop3_handler(ngx_event_t *rev) ngx_add_timer(s->connection->read, pcf->timeout); ngx_del_timer(c->read); - action = c->log->action; c->log->action = NULL; ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in"); - c->log->action = action; c->log->action = "proxying"; } @@ -474,7 +448,7 @@ ngx_imap_proxy_read_response(ngx_imap_session_t *s, ngx_uint_t what) ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "upstream sent too long response line: \"%s\"", b->pos); - return NGX_IMAP_PROXY_INVALID; + return NGX_ERROR; } return NGX_AGAIN; @@ -487,15 +461,7 @@ ngx_imap_proxy_read_response(ngx_imap_session_t *s, ngx_uint_t what) return NGX_OK; } - if (p[0] == '-' && p[1] == 'E' && p[2] == 'R' && p[3] == 'R') { - return NGX_IMAP_PROXY_ERROR; - } - } else { - if (p[0] == 'N' && p[1] == 'O') { - return NGX_IMAP_PROXY_ERROR; - } - if (what == NGX_IMAP_WAIT_OK) { if (p[0] == '*' && p[1] == ' ' && p[2] == 'O' && p[3] == 'K') { return NGX_OK; @@ -512,7 +478,7 @@ ngx_imap_proxy_read_response(ngx_imap_session_t *s, ngx_uint_t what) ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "upstream sent invalid response: \"%s\"", p); - return NGX_IMAP_PROXY_INVALID; + return NGX_ERROR; } |