Mercurial > hg > nginx-vendor-current
diff src/imap/ngx_imap_proxy_module.c @ 136:3656228c0b56 NGINX_0_3_15
nginx 0.3.15
*) Feature: the new 444 code of the "return" directive to close
connection.
*) Feature: the "so_keepalive" directive in IMAP/POP3 proxy.
*) Bugfix: if there are unclosed connection nginx now calls abort()
only on gracefull quit and active "debug_points" directive.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 07 Dec 2005 00:00:00 +0300 |
parents | 91372f004adf |
children | 8e6d4d96ec4c |
line wrap: on
line diff
--- a/src/imap/ngx_imap_proxy_module.c +++ b/src/imap/ngx_imap_proxy_module.c @@ -91,10 +91,27 @@ ngx_module_t ngx_imap_proxy_module = { void ngx_imap_proxy_init(ngx_imap_session_t *s, ngx_peers_t *peers) { + int keepalive; ngx_int_t rc; ngx_imap_proxy_ctx_t *p; ngx_imap_core_srv_conf_t *cscf; + s->connection->log->action = "connecting to upstream"; + + cscf = ngx_imap_get_module_srv_conf(s, ngx_imap_core_module); + + if (cscf->so_keepalive) { + keepalive = 1; + + if (setsockopt(s->connection->fd, SOL_SOCKET, SO_KEEPALIVE, + (const void *) &keepalive, sizeof(int)) + == -1) + { + ngx_log_error(NGX_LOG_ALERT, s->connection->log, ngx_socket_errno, + "setsockopt(SO_KEEPALIVE) failed"); + } + } + p = ngx_pcalloc(s->connection->pool, sizeof(ngx_imap_proxy_ctx_t)); if (p == NULL) { ngx_imap_session_internal_server_error(s); @@ -107,8 +124,6 @@ ngx_imap_proxy_init(ngx_imap_session_t * p->upstream.log = s->connection->log; p->upstream.log_error = NGX_ERROR_ERR; - s->connection->log->action = "in upstream auth state"; - rc = ngx_event_connect_peer(&p->upstream); if (rc == NGX_ERROR || rc == NGX_BUSY || rc == NGX_DECLINED) { @@ -116,7 +131,6 @@ ngx_imap_proxy_init(ngx_imap_session_t * return; } - cscf = ngx_imap_get_module_srv_conf(s, ngx_imap_core_module); ngx_add_timer(p->upstream.connection->read, cscf->timeout); p->upstream.connection->data = s; @@ -205,6 +219,8 @@ ngx_imap_proxy_imap_handler(ngx_event_t ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap proxy send login"); + s->connection->log->action = "sending LOGIN command to upstream"; + line.len = s->tag.len + sizeof("LOGIN ") - 1 + 1 + NGX_SIZE_T_LEN + 1 + 2; line.data = ngx_palloc(c->pool, line.len); @@ -223,6 +239,8 @@ ngx_imap_proxy_imap_handler(ngx_event_t case ngx_imap_login: ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap proxy send user"); + s->connection->log->action = "sending user name to upstream"; + line.len = s->login.len + 1 + 1 + NGX_SIZE_T_LEN + 1 + 2; line.data = ngx_palloc(c->pool, line.len); if (line.data == NULL) { @@ -241,6 +259,8 @@ ngx_imap_proxy_imap_handler(ngx_event_t ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap proxy send passwd"); + s->connection->log->action = "sending password to upstream"; + line.len = s->passwd.len + 2; line.data = ngx_palloc(c->pool, line.len); if (line.data == NULL) { @@ -340,6 +360,8 @@ ngx_imap_proxy_pop3_handler(ngx_event_t case ngx_pop3_start: ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap proxy send user"); + s->connection->log->action = "sending user name to upstream"; + line.len = sizeof("USER ") - 1 + s->login.len + 2; line.data = ngx_palloc(c->pool, line.len); if (line.data == NULL) { @@ -357,6 +379,8 @@ ngx_imap_proxy_pop3_handler(ngx_event_t case ngx_pop3_user: ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap proxy send pass"); + s->connection->log->action = "sending password to upstream"; + line.len = sizeof("PASS ") - 1 + s->passwd.len + 2; line.data = ngx_palloc(c->pool, line.len); if (line.data == NULL) { @@ -431,6 +455,8 @@ ngx_imap_proxy_read_response(ngx_imap_se ssize_t n; ngx_buf_t *b; + s->connection->log->action = "reading response from upstream"; + b = s->proxy->buffer; n = s->proxy->upstream.connection->recv(s->proxy->upstream.connection,