From 02025fd6bdfa997f521c3b26a08aeba366308e84 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 18 Jan 2005 13:03:58 +0000 Subject: nginx-0.1.14-RELEASE import *) 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 /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; the bug had 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. --- src/core/ngx_inet.h | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'src/core/ngx_inet.h') diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h index d0e1f8dfb..a01fc8a70 100644 --- a/src/core/ngx_inet.h +++ b/src/core/ngx_inet.h @@ -8,17 +8,44 @@ #define _NGX_INET_H_INCLUDED_ +#include +#include + + typedef struct { in_addr_t addr; in_addr_t mask; } ngx_inet_cidr_t; -size_t ngx_sock_ntop(int family, struct sockaddr *addr, u_char *text, +typedef struct { + ngx_str_t name; /* "schema:host:port/uri" */ + ngx_str_t url; /* "host:port/uri" */ + ngx_str_t host; + ngx_str_t uri; + ngx_str_t host_header; /* "host:port" */ + ngx_str_t port_text; /* "port" */ + + in_port_t port; + + in_port_t default_port_value; + + unsigned default_port:1; + unsigned wildcard:1; + + unsigned uri_part:1; + unsigned port_only:1; +} ngx_inet_upstream_t; + + +size_t ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text, size_t len); size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len); ngx_int_t ngx_ptocidr(ngx_str_t *text, void *cidr); +ngx_peers_t *ngx_inet_upstream_parse(ngx_conf_t *cf, ngx_inet_upstream_t *u); +char *ngx_inet_parse_host_port(ngx_inet_upstream_t *u); + #endif /* _NGX_INET_H_INCLUDED_ */ -- cgit