Mercurial > hg > nginx
view src/imap/ngx_imap_proxy.c @ 509:9b8c906f6e63 release-0.1.29
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 12 May 2005 14:58:06 +0000 |
parents | d4ea69372b94 |
children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> #include <ngx_event_connect.h> #include <ngx_imap.h> static void ngx_imap_proxy_block_read(ngx_event_t *rev); static void ngx_imap_proxy_auth_handler(ngx_event_t *rev); static void ngx_imap_proxy_dummy_handler(ngx_event_t *ev); static ngx_int_t ngx_imap_proxy_read_response(ngx_imap_session_t *s); static void ngx_imap_proxy_handler(ngx_event_t *ev); static void ngx_imap_proxy_close_session(ngx_imap_session_t *s); void ngx_imap_proxy_init(ngx_imap_session_t *s) { ngx_int_t rc; ngx_peers_t *peers; struct sockaddr_in *sin; ngx_imap_proxy_ctx_t *p; p = ngx_pcalloc(s->connection->pool, sizeof(ngx_imap_proxy_ctx_t)); if (p == NULL) { ngx_imap_close_connection(s->connection); return; } s->proxy = p; /**/ peers = ngx_pcalloc(s->connection->pool, sizeof(ngx_peers_t)); if (peers == NULL) { ngx_imap_close_connection(s->connection); return; } p->upstream.peers = peers; p->upstream.log = s->connection->log; p->upstream.log_error = NGX_ERROR_ERR; sin = ngx_pcalloc(s->connection->pool, sizeof(struct sockaddr_in)); if (sin == NULL) { ngx_imap_close_connection(s->connection); return; } peers->peer[0].sockaddr = (struct sockaddr *) sin; peers->peer[0].socklen = sizeof(struct sockaddr_in); sin->sin_port = htons(110); #if 1 sin->sin_addr.s_addr = inet_addr("81.19.64.101"); peers->peer[0].name.len = sizeof("81.19.64.101:110") - 1; peers->peer[0].name.data = (u_char *) "81.19.64.101:110"; #else sin->sin_addr.s_addr = inet_addr("81.19.69.70"); peers->peer[0].name.len = sizeof("81.19.69.70:110") - 1; peers->peer[0].name.data = (u_char *) "81.19.69.70:110"; #endif peers->number = 1; peers->peer[0].max_fails = 1; peers->peer[0].fail_timeout = 60; peers->peer[0].weight = 1; rc = ngx_event_connect_peer(&p->upstream); if (rc == NGX_ERROR) { ngx_imap_proxy_close_session(s); return; } p->upstream.connection->data = s; p->upstream.connection->pool = s->connection->pool; s->connection->read->handler = ngx_imap_proxy_block_read; p->upstream.connection->read->handler = ngx_imap_proxy_auth_handler; p->upstream.connection->write->handler = ngx_imap_proxy_dummy_handler; } static void ngx_imap_proxy_block_read(ngx_event_t *rev) { ngx_connection_t *c; ngx_imap_session_t *s; ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap proxy block read"); if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { c = rev->data; s = c->data; ngx_imap_proxy_close_session(s); } } static void ngx_imap_proxy_auth_handler(ngx_event_t *rev) { u_char *p; ngx_int_t rc; ngx_str_t line; ngx_connection_t *c; ngx_imap_session_t *s; ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap proxy auth handler"); c = rev->data; s = c->data; if (rev->timedout) { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out"); ngx_imap_proxy_close_session(s); return; } if (s->proxy->buffer == NULL) { s->proxy->buffer = ngx_create_temp_buf(c->pool, /* STUB */ 4096); if (s->proxy->buffer == NULL) { ngx_imap_proxy_close_session(s); return; } } rc = ngx_imap_proxy_read_response(s); if (rc == NGX_AGAIN) { return; } if (rc == NGX_ERROR) { /* TODO: ngx_imap_proxy_finalize_session(s, NGX_IMAP_INTERNAL_ERROR) */ ngx_imap_proxy_close_session(s); return; } if (s->imap_state == ngx_pop3_start) { ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap proxy send user"); line.len = sizeof("USER ") + s->login.len - 1 + 2; line.data = ngx_palloc(c->pool, line.len); if (line.data == NULL) { ngx_imap_proxy_close_session(s); return; } p = ngx_cpymem(line.data, "USER ", sizeof("USER ") - 1); p = ngx_cpymem(p, s->login.data, s->login.len); *p++ = CR; *p = LF; if (ngx_send(c, line.data, line.len) < (ssize_t) line.len) { /* * we treat the incomplete sending as NGX_ERROR * because it is very strange here */ ngx_imap_close_connection(c); return; } s->imap_state = ngx_pop3_user; s->proxy->buffer->pos = s->proxy->buffer->start; s->proxy->buffer->last = s->proxy->buffer->start; return; } ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap proxy send pass"); line.len = sizeof("PASS ") + s->passwd.len - 1 + 2; line.data = ngx_palloc(c->pool, line.len); if (line.data == NULL) { ngx_imap_proxy_close_session(s); return; } p = ngx_cpymem(line.data, "PASS ", sizeof("PASS ") - 1); p = ngx_cpymem(p, s->passwd.data, s->passwd.len); *p++ = CR; *p = LF; if (ngx_send(c, line.data, line.len) < (ssize_t) line.len) { /* * we treat the incomplete sending as NGX_ERROR * because it is very strange here */ ngx_imap_close_connection(c); return; } s->proxy->buffer->pos = s->proxy->buffer->start; s->proxy->buffer->last = s->proxy->buffer->start; 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; } static void ngx_imap_proxy_dummy_handler(ngx_event_t *ev) { ngx_log_debug0(NGX_LOG_DEBUG_IMAP, ev->log, 0, "imap proxy dummy handler"); } static ngx_int_t ngx_imap_proxy_read_response(ngx_imap_session_t *s) { u_char *p; ssize_t n; ngx_buf_t *b; b = s->proxy->buffer; n = ngx_recv(s->proxy->upstream.connection, b->last, b->end - b->last); if (n == NGX_ERROR || n == 0) { return NGX_ERROR; } if (n == NGX_AGAIN) { return NGX_AGAIN; } b->last += n; if (b->last - b->pos < 5) { return NGX_AGAIN; } if (*(b->last - 2) != CR || *(b->last - 1) != LF) { if (b->last == b->end) { *(b->last - 1) = '\0'; 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_AGAIN; } p = b->pos; if (p[0] == '+' && p[1] == 'O' && p[2] == 'K') { return NGX_OK; } if (p[0] == '-' && p[1] == 'E' && p[2] == 'R' && p[3] == 'R') { return NGX_IMAP_PROXY_ERROR; } *(b->last - 2) = '\0'; ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "upstream sent invalid greeting line: \"%s\"", p); return NGX_IMAP_PROXY_INVALID; } static void ngx_imap_proxy_handler(ngx_event_t *ev) { size_t size; ssize_t n; ngx_buf_t *b; ngx_uint_t again, do_write; ngx_connection_t *c, *src, *dst; ngx_imap_session_t *s; c = ev->data; s = c->data; if (ev->timedout) { if (c == s->connection) { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out"); } else { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "upstream timed out"); } ngx_imap_proxy_close_session(s); return; } if (c == s->connection) { if (ev->write) { src = s->proxy->upstream.connection; dst = c; b = s->proxy->buffer; } else { src = c; dst = s->proxy->upstream.connection; b = s->buffer; } } else { if (ev->write) { src = s->connection; dst = c; b = s->buffer; } else { src = c; dst = s->connection; b = s->proxy->buffer; } } do_write = ev->write ? 1 : 0; ngx_log_debug3(NGX_LOG_DEBUG_IMAP, ev->log, 0, "imap proxy handler: %d, #%d > #%d", do_write, src->fd, dst->fd); do { again = 0; if (do_write == 1) { size = b->last - b->pos; if (size && dst->write->ready) { n = ngx_send(dst, b->pos, size); if (n == NGX_ERROR) { ngx_imap_proxy_close_session(s); return; } if (n > 0) { again = 1; b->pos += n; if (b->pos == b->last) { b->pos = b->start; b->last = b->start; } } if (n == NGX_AGAIN || n < (ssize_t) size) { if (ngx_handle_write_event(dst->write, /* TODO: LOWAT */ 0) == NGX_ERROR) { ngx_imap_proxy_close_session(s); return; } } } } size = b->end - b->last; if (size && src->read->ready) { n = ngx_recv(src, b->last, size); if (n == NGX_ERROR || n == 0) { ngx_imap_proxy_close_session(s); return; } if (n > 0) { again = 1; do_write = 1; b->last += n; } if (n == NGX_AGAIN || n < (ssize_t) size) { if (ngx_handle_read_event(src->read, 0) == NGX_ERROR) { ngx_imap_proxy_close_session(s); return; } } } } while (again); } static void ngx_imap_proxy_close_session(ngx_imap_session_t *s) { if (ngx_close_socket(s->proxy->upstream.connection->fd) == -1) { ngx_log_error(NGX_LOG_ALERT, s->connection->log, ngx_socket_errno, ngx_close_socket_n " failed"); } ngx_imap_close_connection(s->connection); }