Mercurial > hg > nginx-vendor-current
diff src/core/ngx_inet.h @ 400:6ebbca3d5ed7 NGINX_0_7_12
nginx 0.7.12
*) Feature: the "server_name" directive supports empty name "".
*) Feature: the "gzip_disable" directive supports special "msie6" mask.
*) Bugfix: if the "max_fails=0" parameter was used in upstream with
several servers, then a worker process exited on a SIGFPE signal.
Thanks to Maxim Dounin.
*) Bugfix: a request body was dropped while redirection via an
"error_page" directive.
*) Bugfix: a full response was returned for request method HEAD while
redirection via an "error_page" directive.
*) Bugfix: the $r->header_in() method did not return value of the
"Host", "User-Agent", and "Connection" request header lines; the bug
had appeared in 0.7.0.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Tue, 26 Aug 2008 00:00:00 +0400 |
| parents | 583decdb82a4 |
| children | 76a79816b771 |
line wrap: on
line diff
--- a/src/core/ngx_inet.h +++ b/src/core/ngx_inet.h @@ -12,6 +12,9 @@ #include <ngx_core.h> +#define NGX_INET_ADDRSTRLEN (sizeof("255.255.255.255") - 1) + + typedef struct { in_addr_t addr; in_addr_t mask; @@ -31,8 +34,6 @@ typedef struct { typedef struct { - ngx_int_t type; - ngx_str_t url; ngx_str_t host; ngx_str_t port_text; @@ -40,15 +41,14 @@ typedef struct { in_port_t port; in_port_t default_port; + int family; unsigned listen:1; unsigned uri_part:1; unsigned no_resolve:1; unsigned one_addr:1; - unsigned wildcard:1; unsigned no_port:1; - unsigned unix_socket:1; ngx_url_addr_t addr; @@ -60,7 +60,7 @@ typedef struct { in_addr_t ngx_inet_addr(u_char *text, size_t len); -size_t ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text, size_t len); +size_t ngx_sock_ntop(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_int_t ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u);