Mercurial > hg > nginx
view src/imap/ngx_imap_handler.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 | 6f00349b98e5 |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> #include <ngx_imap.h> #include <nginx.h> static void ngx_imap_init_session(ngx_event_t *rev); static void ngx_pop3_auth_state(ngx_event_t *rev); static ngx_int_t ngx_pop3_read_command(ngx_imap_session_t *s); static u_char pop3_greeting[] = "+OK " NGINX_VER " ready" CRLF; #if 0 static u_char imap_greeting[] = "* OK " NGINX_VER " ready" CRLF; #endif static u_char pop3_ok[] = "+OK" CRLF; static u_char pop3_invalid_command[] = "-ERR invalid command" CRLF; void ngx_imap_init_connection(ngx_connection_t *c) { u_char *greeting; ssize_t size; ngx_log_debug0(NGX_LOG_DEBUG_IMAP, c->log, 0, "imap init connection"); c->log_error = NGX_ERROR_INFO; greeting = pop3_greeting; size = sizeof(pop3_greeting) - 1; if (ngx_send(c, greeting, size) < size) { /* * we treat the incomplete sending as NGX_ERROR * because it is very strange here */ ngx_imap_close_connection(c); return; } c->read->handler = ngx_imap_init_session; ngx_add_timer(c->read, /* STUB */ 60000); if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) { ngx_imap_close_connection(c); } } static void ngx_imap_init_session(ngx_event_t *rev) { size_t size; ngx_connection_t *c; ngx_imap_session_t *s; c = rev->data; if (rev->timedout) { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out"); ngx_imap_close_connection(c); return; } s = ngx_pcalloc(c->pool, sizeof(ngx_imap_session_t)); if (s == NULL) { ngx_imap_close_connection(c); return; } c->data = s; s->connection = c; if (ngx_array_init(&s->args, c->pool, 2, sizeof(ngx_str_t)) == NGX_ERROR) { ngx_imap_close_connection(c); return; } size = /* STUB: pop3: 128, imap: configurable 4K default */ 128; s->buffer = ngx_create_temp_buf(c->pool, size); if (s->buffer == NULL) { ngx_imap_close_connection(c); return; } c->read->handler = ngx_pop3_auth_state; ngx_pop3_auth_state(rev); } static void ngx_pop3_auth_state(ngx_event_t *rev) { u_char *text; ssize_t size; ngx_int_t rc; ngx_uint_t quit; ngx_str_t *arg; ngx_connection_t *c; ngx_imap_session_t *s; c = rev->data; s = c->data; ngx_log_debug0(NGX_LOG_DEBUG_IMAP, c->log, 0, "pop3 auth state"); if (rev->timedout) { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out"); ngx_imap_close_connection(c); return; } rc = ngx_pop3_read_command(s); if (rc == NGX_AGAIN || rc == NGX_ERROR) { return; } quit = 0; text = pop3_ok; size = sizeof(pop3_ok) - 1; if (rc == NGX_OK) { switch (s->imap_state) { case ngx_pop3_start: switch (s->command) { case NGX_POP3_USER: if (s->args.nelts == 1) { s->imap_state = ngx_pop3_user; arg = s->args.elts; s->login.len = arg[0].len; s->login.data = ngx_palloc(c->pool, s->login.len + 1); if (s->login.data == NULL) { ngx_imap_close_connection(c); return; } ngx_cpystrn(s->login.data, arg[0].data, s->login.len + 1); ngx_log_debug1(NGX_LOG_DEBUG_IMAP, c->log, 0, "pop3 login: \"%s\"", s->login.data); } else { rc = NGX_IMAP_PARSE_INVALID_COMMAND; } break; case NGX_POP3_QUIT: quit = 1; break; default: s->imap_state = ngx_pop3_start; rc = NGX_IMAP_PARSE_INVALID_COMMAND; break; } break; case ngx_pop3_user: switch (s->command) { case NGX_POP3_PASS: if (s->args.nelts == 1) { /* STUB */ s->imap_state = ngx_pop3_start; arg = s->args.elts; s->passwd.len = arg[0].len; s->passwd.data = ngx_palloc(c->pool, s->passwd.len + 1); if (s->passwd.data == NULL) { ngx_imap_close_connection(c); return; } ngx_cpystrn(s->passwd.data, arg[0].data, s->passwd.len + 1); ngx_log_debug1(NGX_LOG_DEBUG_IMAP, c->log, 0, "pop3 passwd: \"%s\"", s->passwd.data); s->buffer->pos = s->buffer->start; s->buffer->last = s->buffer->start; ngx_imap_proxy_init(s); return; } else { rc = NGX_IMAP_PARSE_INVALID_COMMAND; } break; case NGX_POP3_QUIT: quit = 1; break; default: s->imap_state = ngx_pop3_start; rc = NGX_IMAP_PARSE_INVALID_COMMAND; break; } break; } } if (rc == NGX_IMAP_PARSE_INVALID_COMMAND) { text = pop3_invalid_command; size = sizeof(pop3_invalid_command) - 1; } if (ngx_send(c, text, size) < size) { /* * we treat the incomplete sending as NGX_ERROR * because it is very strange here */ ngx_imap_close_connection(c); return; } if (quit) { ngx_imap_close_connection(c); return; } s->args.nelts = 0; s->buffer->pos = s->buffer->start; s->buffer->last = s->buffer->start; } static ngx_int_t ngx_pop3_read_command(ngx_imap_session_t *s) { ssize_t n; ngx_int_t rc; n = ngx_recv(s->connection, s->buffer->last, s->buffer->end - s->buffer->last); if (n == NGX_ERROR || n == 0) { ngx_imap_close_connection(s->connection); return NGX_ERROR; } if (n > 0) { s->buffer->last += n; } if (n == NGX_AGAIN) { if (ngx_handle_read_event(s->connection->read, 0) == NGX_ERROR) { ngx_imap_close_connection(s->connection); return NGX_ERROR; } return NGX_AGAIN; } rc = ngx_pop3_parse_command(s); if (rc == NGX_AGAIN || rc == NGX_IMAP_PARSE_INVALID_COMMAND) { return rc; } if (rc == NGX_ERROR) { ngx_imap_close_connection(s->connection); return NGX_ERROR; } return NGX_OK; } #if 0 void ngx_imap_close_session(ngx_imap_session_t *s) { ngx_log_debug0(NGX_LOG_DEBUG_IMAP, s->connection->log, 0, "close imap session"); ngx_imap_close_connection(s->connection); } #endif void ngx_imap_close_connection(ngx_connection_t *c) { ngx_pool_t *pool; ngx_log_debug1(NGX_LOG_DEBUG_IMAP, c->log, 0, "close imap connection: %d", c->fd); pool = c->pool; ngx_close_connection(c); ngx_destroy_pool(pool); }