Mercurial > hg > nginx-vendor-1-0
view src/event/ngx_event_connect.c @ 58:b55cbf18157e NGINX_0_1_29
nginx 0.1.29
*) 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; bug 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 <http://sysoev.ru> |
---|---|
date | Thu, 12 May 2005 00:00:00 +0400 |
parents | a39d1b793287 |
children | 77969b24f355 |
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> #define NGX_RESOLVER_BUFSIZE 8192 ngx_int_t ngx_event_connect_peer(ngx_peer_connection_t *pc) { int rc; ngx_uint_t instance; u_int event; time_t now; ngx_err_t err; ngx_peer_t *peer; ngx_socket_t s; ngx_event_t *rev, *wev; ngx_connection_t *c; ngx_event_conf_t *ecf; now = ngx_time(); /* ngx_lock_mutex(pc->peers->mutex); */ if (pc->peers->last_cached) { /* cached connection */ c = pc->peers->cached[pc->peers->last_cached]; pc->peers->last_cached--; /* ngx_unlock_mutex(pc->peers->mutex); */ #if (NGX_THREADS) c->read->lock = c->read->own_lock; c->write->lock = c->write->own_lock; #endif pc->connection = c; pc->cached = 1; return NGX_OK; } pc->cached = 0; pc->connection = NULL; if (pc->peers->number == 1) { peer = &pc->peers->peer[0]; } else { /* there are several peers */ if (pc->tries == pc->peers->number) { /* it's a first try - get a current peer */ pc->cur_peer = pc->peers->current; pc->peers->weight--; if (pc->peers->weight == 0) { pc->peers->current++; } if (pc->peers->current >= pc->peers->number) { pc->peers->current = 0; } if (pc->peers->weight == 0) { pc->peers->weight = pc->peers->peer[pc->peers->current].weight; } } for ( ;; ) { peer = &pc->peers->peer[pc->cur_peer]; if (peer->fails <= peer->max_fails) { break; } if (now - peer->accessed > peer->fail_timeout) { peer->fails = 0; break; } pc->cur_peer++; if (pc->cur_peer >= pc->peers->number) { pc->cur_peer = 0; } pc->tries--; if (pc->tries == 0) { /* ngx_unlock_mutex(pc->peers->mutex); */ return NGX_ERROR; } } } /* ngx_unlock_mutex(pc->peers->mutex); */ s = ngx_socket(peer->sockaddr->sa_family, SOCK_STREAM, 0); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0, "socket %d", s); if (s == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ngx_socket_n " failed"); return NGX_ERROR; } ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module); /* disable warning: Win32 SOCKET is u_int while UNIX socket is int */ if ((ngx_uint_t) s >= ecf->connections) { ngx_log_error(NGX_LOG_ALERT, pc->log, 0, "socket() returned socket #%d while only %d " "connections was configured, closing the socket", s, ecf->connections); if (ngx_close_socket(s) == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ngx_close_socket_n "failed"); } /* TODO: sleep for some time */ return NGX_ERROR; } if (pc->rcvbuf) { if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, (const void *) &pc->rcvbuf, sizeof(int)) == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, "setsockopt(SO_RCVBUF) failed"); if (ngx_close_socket(s) == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ngx_close_socket_n " failed"); } return NGX_ERROR; } } if (ngx_nonblocking(s) == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ngx_nonblocking_n " failed"); if (ngx_close_socket(s) == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ngx_close_socket_n " failed"); } return NGX_ERROR; } #if (NGX_WIN32) /* * Winsock assignes a socket number divisible by 4 * so to find a connection we divide a socket number by 4. */ if (s % 4) { ngx_log_error(NGX_LOG_EMERG, pc->log, 0, ngx_socket_n " created socket %d, not divisible by 4", s); exit(1); } c = &ngx_cycle->connections[s / 4]; rev = &ngx_cycle->read_events[s / 4]; wev = &ngx_cycle->write_events[s / 4]; #else c = &ngx_cycle->connections[s]; rev = &ngx_cycle->read_events[s]; wev = &ngx_cycle->write_events[s]; #endif instance = rev->instance; #if (NGX_THREADS) if (*(&c->lock)) { ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0, "spinlock in connect, fd:%d", s); ngx_spinlock(&c->lock, 1000); ngx_unlock(&c->lock); } #endif ngx_memzero(c, sizeof(ngx_connection_t)); ngx_memzero(rev, sizeof(ngx_event_t)); ngx_memzero(wev, sizeof(ngx_event_t)); rev->instance = !instance; wev->instance = !instance; rev->index = NGX_INVALID_INDEX; wev->index = NGX_INVALID_INDEX; rev->data = c; wev->data = c; c->read = rev; c->write = wev; wev->write = 1; c->log = pc->log; rev->log = pc->log; wev->log = pc->log; c->fd = s; c->log_error = pc->log_error; if (peer->sockaddr->sa_family != AF_INET) { c->tcp_nopush = NGX_TCP_NOPUSH_DISABLED; c->tcp_nodelay = NGX_TCP_NODELAY_DISABLED; } pc->connection = c; /* * TODO: MT: - atomic increment (x86: lock xadd) * or protection by critical section or mutex * * TODO: MP: - allocated in a shared memory * - atomic increment (x86: lock xadd) * or protection by critical section or mutex */ c->number = ngx_atomic_inc(ngx_connection_counter); #if (NGX_THREADS) rev->lock = pc->lock; wev->lock = pc->lock; rev->own_lock = &c->lock; wev->own_lock = &c->lock; #endif if (ngx_add_conn) { if (ngx_add_conn(c) == NGX_ERROR) { return NGX_ERROR; } } ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0, "connect to %V, #%d", &peer->name, c->number); rc = connect(s, peer->sockaddr, peer->socklen); if (rc == -1) { err = ngx_socket_errno; /* Winsock returns WSAEWOULDBLOCK (NGX_EAGAIN) */ if (err != NGX_EINPROGRESS && err != NGX_EAGAIN) { ngx_connection_error(c, err, "connect() failed"); #if 0 #undef sun { struct sockaddr_un *sun; sun = (struct sockaddr_un *) peer->sockaddr; ngx_log_error(NGX_LOG_ALERT, pc->log, 0, "\"%s\", f:%d, l:%uz", sun->sun_path, sun->sun_family, peer->socklen); } #endif return NGX_CONNECT_ERROR; } } if (ngx_add_conn) { if (rc == -1) { /* NGX_EINPROGRESS */ return NGX_AGAIN; } ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pc->log, 0, "connected"); wev->ready = 1; return NGX_OK; } if (ngx_event_flags & NGX_USE_AIO_EVENT) { ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, ngx_socket_errno, "connect(): %d", rc); /* aio, iocp */ if (ngx_blocking(s) == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ngx_blocking_n " failed"); return NGX_ERROR; } /* * FreeBSD's aio allows to post an operation on non-connected socket. * NT does not support it. * * TODO: check in Win32, etc. As workaround we can use NGX_ONESHOT_EVENT */ rev->ready = 1; wev->ready = 1; return NGX_OK; } if (ngx_event_flags & NGX_USE_CLEAR_EVENT) { /* kqueue */ event = NGX_CLEAR_EVENT; } else { /* select, poll, /dev/poll */ event = NGX_LEVEL_EVENT; } if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) { return NGX_ERROR; } if (rc == -1) { /* NGX_EINPROGRESS */ if (ngx_add_event(wev, NGX_WRITE_EVENT, event) != NGX_OK) { return NGX_ERROR; } return NGX_AGAIN; } ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pc->log, 0, "connected"); wev->ready = 1; return NGX_OK; } void ngx_event_connect_peer_failed(ngx_peer_connection_t *pc) { time_t now; now = ngx_time(); /* ngx_lock_mutex(pc->peers->mutex); */ pc->peers->peer[pc->cur_peer].fails++; pc->peers->peer[pc->cur_peer].accessed = now; /* ngx_unlock_mutex(pc->peers->mutex); */ pc->cur_peer++; if (pc->cur_peer >= pc->peers->number) { pc->cur_peer = 0; } pc->tries--; }