comparison src/core/ngx_inet.h @ 406: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
comparison
equal deleted inserted replaced
404:59e324e4d6d3 406:6ebbca3d5ed7
8 #define _NGX_INET_H_INCLUDED_ 8 #define _NGX_INET_H_INCLUDED_
9 9
10 10
11 #include <ngx_config.h> 11 #include <ngx_config.h>
12 #include <ngx_core.h> 12 #include <ngx_core.h>
13
14
15 #define NGX_INET_ADDRSTRLEN (sizeof("255.255.255.255") - 1)
13 16
14 17
15 typedef struct { 18 typedef struct {
16 in_addr_t addr; 19 in_addr_t addr;
17 in_addr_t mask; 20 in_addr_t mask;
29 ngx_str_t name; 32 ngx_str_t name;
30 } ngx_peer_addr_t; 33 } ngx_peer_addr_t;
31 34
32 35
33 typedef struct { 36 typedef struct {
34 ngx_int_t type;
35
36 ngx_str_t url; 37 ngx_str_t url;
37 ngx_str_t host; 38 ngx_str_t host;
38 ngx_str_t port_text; 39 ngx_str_t port_text;
39 ngx_str_t uri; 40 ngx_str_t uri;
40 41
41 in_port_t port; 42 in_port_t port;
42 in_port_t default_port; 43 in_port_t default_port;
44 int family;
43 45
44 unsigned listen:1; 46 unsigned listen:1;
45 unsigned uri_part:1; 47 unsigned uri_part:1;
46 unsigned no_resolve:1; 48 unsigned no_resolve:1;
47 unsigned one_addr:1; 49 unsigned one_addr:1;
48 50
49 unsigned wildcard:1;
50 unsigned no_port:1; 51 unsigned no_port:1;
51 unsigned unix_socket:1;
52 52
53 ngx_url_addr_t addr; 53 ngx_url_addr_t addr;
54 54
55 ngx_peer_addr_t *addrs; 55 ngx_peer_addr_t *addrs;
56 ngx_uint_t naddrs; 56 ngx_uint_t naddrs;
58 char *err; 58 char *err;
59 } ngx_url_t; 59 } ngx_url_t;
60 60
61 61
62 in_addr_t ngx_inet_addr(u_char *text, size_t len); 62 in_addr_t ngx_inet_addr(u_char *text, size_t len);
63 size_t ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text, size_t len); 63 size_t ngx_sock_ntop(struct sockaddr *sa, u_char *text, size_t len);
64 size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len); 64 size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len);
65 ngx_int_t ngx_ptocidr(ngx_str_t *text, void *cidr); 65 ngx_int_t ngx_ptocidr(ngx_str_t *text, void *cidr);
66 ngx_int_t ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u); 66 ngx_int_t ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u);
67 ngx_int_t ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u); 67 ngx_int_t ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u);
68 68