Mercurial > hg > nginx-vendor-0-6
diff src/core/ngx_connection.c @ 28:7ca9bdc82b3f NGINX_0_1_14
nginx 0.1.14
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; bug appeared in 0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 18 Jan 2005 00:00:00 +0300 |
parents | 45fe5b98a9de |
children | da8c190bdaba |
line wrap: on
line diff
--- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -18,7 +18,7 @@ ngx_listening_t *ngx_listening_inet_stre { size_t len; ngx_listening_t *ls; - struct sockaddr_in *addr_in; + struct sockaddr_in *sin; if (!(ls = ngx_array_push(&cf->cycle->listening))) { return NULL; @@ -26,13 +26,13 @@ ngx_listening_t *ngx_listening_inet_stre ngx_memzero(ls, sizeof(ngx_listening_t)); - if (!(addr_in = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)))) { + if (!(sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)))) { return NULL; } - addr_in->sin_family = AF_INET; - addr_in->sin_addr.s_addr = addr; - addr_in->sin_port = htons(port); + sin->sin_family = AF_INET; + sin->sin_addr.s_addr = addr; + sin->sin_port = htons(port); ls->addr_text.data = ngx_palloc(cf->pool, @@ -50,8 +50,7 @@ ngx_listening_t *ngx_listening_inet_stre ls->fd = (ngx_socket_t) -1; ls->family = AF_INET; ls->type = SOCK_STREAM; - ls->protocol = IPPROTO_IP; - ls->sockaddr = (struct sockaddr *) addr_in; + ls->sockaddr = (struct sockaddr *) sin; ls->socklen = sizeof(struct sockaddr_in); ls->addr = offsetof(struct sockaddr_in, sin_addr); ls->addr_text_max_len = INET_ADDRSTRLEN; @@ -65,7 +64,7 @@ ngx_int_t ngx_set_inherited_sockets(ngx_ size_t len; ngx_uint_t i; ngx_listening_t *ls; - struct sockaddr_in *addr_in; + struct sockaddr_in *sin; ls = cycle->listening.elts; for (i = 0; i < cycle->listening.nelts; i++) { @@ -86,9 +85,9 @@ ngx_int_t ngx_set_inherited_sockets(ngx_ continue; } - addr_in = (struct sockaddr_in *) ls[i].sockaddr; + sin = (struct sockaddr_in *) ls[i].sockaddr; - if (addr_in->sin_family != AF_INET) { + if (sin->sin_family != AF_INET) { ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno, "the inherited socket #%d has " "unsupported family", ls[i].fd); @@ -105,7 +104,7 @@ ngx_int_t ngx_set_inherited_sockets(ngx_ return NGX_ERROR; } - ls[i].family = addr_in->sin_family; + ls[i].family = sin->sin_family; len = ngx_sock_ntop(ls[i].family, ls[i].sockaddr, ls[i].addr_text.data, INET_ADDRSTRLEN); if (len == 0) { @@ -113,7 +112,7 @@ ngx_int_t ngx_set_inherited_sockets(ngx_ } ls[i].addr_text.len = ngx_sprintf(ls[i].addr_text.data + len, ":%d", - ntohs(addr_in->sin_port)) + ntohs(sin->sin_port)) - ls[i].addr_text.data; } @@ -163,7 +162,7 @@ ngx_int_t ngx_open_listening_sockets(ngx continue; } - s = ngx_socket(ls[i].family, ls[i].type, ls[i].protocol); + s = ngx_socket(ls[i].family, ls[i].type, 0); if (s == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, @@ -313,7 +312,7 @@ void ngx_close_connection(ngx_connection { ngx_socket_t fd; - if (c->pool == NULL) { + if (c->fd == -1) { ngx_log_error(NGX_LOG_ALERT, c->log, 0, "connection already closed"); return; } @@ -388,8 +387,6 @@ void ngx_close_connection(ngx_connection c->fd = (ngx_socket_t) -1; c->data = NULL; - ngx_destroy_pool(c->pool); - if (ngx_close_socket(fd) == -1) { /* we use ngx_cycle->log because c->log was in c->pool */