7fed746a3a
*) 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; the bug had 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.
486 lines
10 KiB
C
486 lines
10 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
*/
|
|
|
|
|
|
#include <ngx_config.h>
|
|
#include <ngx_core.h>
|
|
#include <ngx_event.h>
|
|
#include <ngx_event_connect.h>
|
|
|
|
|
|
/*
|
|
* ngx_sock_ntop() and ngx_inet_ntop() may be implemented as
|
|
* "ngx_sprintf(text, "%ud.%ud.%ud.%ud", p[0], p[1], p[2], p[3])",
|
|
* however, they were implemented long before the ngx_sprintf() appeared
|
|
* and they are faster by 1.5-2.5 times, so it is worth to keep them.
|
|
*
|
|
* By the way, the implementation using ngx_sprintf() is faster by 2.5-3 times
|
|
* than using FreeBSD libc's snprintf().
|
|
*/
|
|
|
|
|
|
static
|
|
ngx_inline size_t ngx_sprint_uchar(u_char *text, u_char c, size_t len)
|
|
{
|
|
size_t n;
|
|
ngx_uint_t c1, c2;
|
|
|
|
n = 0;
|
|
|
|
if (len == n) {
|
|
return n;
|
|
}
|
|
|
|
c1 = c / 100;
|
|
|
|
if (c1) {
|
|
*text++ = (u_char) (c1 + '0');
|
|
n++;
|
|
|
|
if (len == n) {
|
|
return n;
|
|
}
|
|
}
|
|
|
|
c2 = (c % 100) / 10;
|
|
|
|
if (c1 || c2) {
|
|
*text++ = (u_char) (c2 + '0');
|
|
n++;
|
|
|
|
if (len == n) {
|
|
return n;
|
|
}
|
|
}
|
|
|
|
c2 = c % 10;
|
|
|
|
*text++ = (u_char) (c2 + '0');
|
|
n++;
|
|
|
|
return n;
|
|
}
|
|
|
|
|
|
/* AF_INET only */
|
|
|
|
size_t
|
|
ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text, size_t len)
|
|
{
|
|
u_char *p;
|
|
size_t n;
|
|
ngx_uint_t i;
|
|
struct sockaddr_in *sin;
|
|
|
|
if (len == 0) {
|
|
return 0;
|
|
}
|
|
|
|
if (family != AF_INET) {
|
|
return 0;
|
|
}
|
|
|
|
sin = (struct sockaddr_in *) sa;
|
|
p = (u_char *) &sin->sin_addr;
|
|
|
|
if (len > INET_ADDRSTRLEN) {
|
|
len = INET_ADDRSTRLEN;
|
|
}
|
|
|
|
n = ngx_sprint_uchar(text, p[0], len);
|
|
|
|
i = 1;
|
|
|
|
do {
|
|
if (len == n) {
|
|
text[n - 1] = '\0';
|
|
return n;
|
|
}
|
|
|
|
text[n++] = '.';
|
|
|
|
if (len == n) {
|
|
text[n - 1] = '\0';
|
|
return n;
|
|
}
|
|
|
|
n += ngx_sprint_uchar(&text[n], p[i++], len - n);
|
|
|
|
} while (i < 4);
|
|
|
|
if (len == n) {
|
|
text[n] = '\0';
|
|
return n;
|
|
}
|
|
|
|
text[n] = '\0';
|
|
|
|
return n;
|
|
}
|
|
|
|
size_t
|
|
ngx_inet_ntop(int family, void *addr, u_char *text, size_t len)
|
|
{
|
|
u_char *p;
|
|
size_t n;
|
|
ngx_uint_t i;
|
|
|
|
if (len == 0) {
|
|
return 0;
|
|
}
|
|
|
|
if (family != AF_INET) {
|
|
return 0;
|
|
}
|
|
|
|
p = (u_char *) addr;
|
|
|
|
if (len > INET_ADDRSTRLEN) {
|
|
len = INET_ADDRSTRLEN;
|
|
}
|
|
|
|
n = ngx_sprint_uchar(text, p[0], len);
|
|
|
|
i = 1;
|
|
|
|
do {
|
|
if (len == n) {
|
|
text[n - 1] = '\0';
|
|
return n;
|
|
}
|
|
|
|
text[n++] = '.';
|
|
|
|
if (len == n) {
|
|
text[n - 1] = '\0';
|
|
return n;
|
|
}
|
|
|
|
n += ngx_sprint_uchar(&text[n], p[i++], len - n);
|
|
|
|
} while (i < 4);
|
|
|
|
if (len == n) {
|
|
text[n] = '\0';
|
|
return n;
|
|
}
|
|
|
|
text[n] = '\0';
|
|
|
|
return n;
|
|
}
|
|
|
|
|
|
/* AF_INET only */
|
|
|
|
ngx_int_t
|
|
ngx_ptocidr(ngx_str_t *text, void *cidr)
|
|
{
|
|
ngx_int_t m;
|
|
ngx_uint_t i;
|
|
ngx_inet_cidr_t *in_cidr;
|
|
|
|
in_cidr = cidr;
|
|
|
|
for (i = 0; i < text->len; i++) {
|
|
if (text->data[i] == '/') {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (i == text->len) {
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
text->data[i] = '\0';
|
|
in_cidr->addr = inet_addr((char *) text->data);
|
|
text->data[i] = '/';
|
|
if (in_cidr->addr == INADDR_NONE) {
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
m = ngx_atoi(&text->data[i + 1], text->len - (i + 1));
|
|
if (m == NGX_ERROR) {
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
if (m == 0) {
|
|
|
|
/* the x86 compilers use the shl instruction that shifts by modulo 32 */
|
|
|
|
in_cidr->mask = 0;
|
|
return NGX_OK;
|
|
}
|
|
|
|
in_cidr->mask = htonl((ngx_uint_t) (0 - (1 << (32 - m))));
|
|
|
|
return NGX_OK;
|
|
}
|
|
|
|
|
|
ngx_peers_t *
|
|
ngx_inet_upstream_parse(ngx_conf_t *cf, ngx_inet_upstream_t *u)
|
|
{
|
|
char *err;
|
|
u_char *host;
|
|
in_addr_t in_addr;
|
|
ngx_uint_t i, len;
|
|
ngx_peers_t *peers;
|
|
struct hostent *h;
|
|
struct sockaddr_in *sin;
|
|
|
|
err = ngx_inet_parse_host_port(u);
|
|
|
|
if (err) {
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
|
"%s in upstream \"%V\"", err, &u->name);
|
|
return NULL;
|
|
}
|
|
|
|
if (u->default_port) {
|
|
if (u->default_port_value == 0) {
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
|
"no port in upstream \"%V\"", &u->name);
|
|
return NULL;
|
|
}
|
|
|
|
u->port = u->default_port_value;
|
|
|
|
u->port_text.data = ngx_palloc(cf->pool, sizeof("65536") - 1);
|
|
if (u->port_text.data == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
u->port_text.len = ngx_sprintf(u->port_text.data, "%d",
|
|
u->default_port_value)
|
|
- u->port_text.data;
|
|
|
|
} else if (u->port) {
|
|
if (u->port == u->default_port_value) {
|
|
u->default_port = 1;
|
|
}
|
|
|
|
} else {
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
|
"no port in upstream \"%V\"", &u->name);
|
|
return NULL;
|
|
}
|
|
|
|
if (u->host.len == 0) {
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
|
"no host in upstream \"%V\"", &u->name);
|
|
return NULL;
|
|
}
|
|
|
|
u->port = htons(u->port);
|
|
|
|
host = ngx_palloc(cf->pool, u->host.len + 1);
|
|
if (host == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
ngx_cpystrn(host, u->host.data, u->host.len + 1);
|
|
|
|
/* AF_INET only */
|
|
|
|
in_addr = inet_addr((char *) host);
|
|
|
|
if (in_addr == INADDR_NONE) {
|
|
h = gethostbyname((char *) host);
|
|
|
|
if (h == NULL || h->h_addr_list[0] == NULL) {
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
|
"host %s is not found in upstream \"%V\"",
|
|
host, &u->name);
|
|
return NULL;
|
|
}
|
|
|
|
for (i = 0; h->h_addr_list[i] != NULL; i++) { /* void */ }
|
|
|
|
/* MP: ngx_shared_palloc() */
|
|
|
|
peers = ngx_pcalloc(cf->pool,
|
|
sizeof(ngx_peers_t) + sizeof(ngx_peer_t) * (i - 1));
|
|
if (peers == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
peers->number = i;
|
|
peers->weight = 1;
|
|
|
|
for (i = 0; h->h_addr_list[i] != NULL; i++) {
|
|
|
|
sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in));
|
|
if (sin == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
sin->sin_family = AF_INET;
|
|
sin->sin_port = u->port;
|
|
sin->sin_addr.s_addr = *(in_addr_t *) (h->h_addr_list[i]);
|
|
|
|
peers->peer[i].sockaddr = (struct sockaddr *) sin;
|
|
peers->peer[i].socklen = sizeof(struct sockaddr_in);
|
|
|
|
len = INET_ADDRSTRLEN - 1 + 1 + u->port_text.len;
|
|
|
|
peers->peer[i].name.data = ngx_palloc(cf->pool, len);
|
|
if (peers->peer[i].name.data == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
len = ngx_sock_ntop(AF_INET, (struct sockaddr *) sin,
|
|
peers->peer[i].name.data, len);
|
|
|
|
peers->peer[i].name.data[len++] = ':';
|
|
|
|
ngx_memcpy(peers->peer[i].name.data + len,
|
|
u->port_text.data, u->port_text.len);
|
|
|
|
peers->peer[i].name.len = len + u->port_text.len;
|
|
|
|
peers->peer[i].uri_separator = "";
|
|
|
|
peers->peer[i].weight = 1;
|
|
peers->peer[i].max_fails = 1;
|
|
peers->peer[i].fail_timeout = 60;
|
|
}
|
|
|
|
} else {
|
|
|
|
/* MP: ngx_shared_palloc() */
|
|
|
|
peers = ngx_pcalloc(cf->pool, sizeof(ngx_peers_t));
|
|
if (peers == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in));
|
|
if (sin == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
peers->number = 1;
|
|
|
|
sin->sin_family = AF_INET;
|
|
sin->sin_port = u->port;
|
|
sin->sin_addr.s_addr = in_addr;
|
|
|
|
peers->peer[0].sockaddr = (struct sockaddr *) sin;
|
|
peers->peer[0].socklen = sizeof(struct sockaddr_in);
|
|
|
|
len = u->host.len + 1 + u->port_text.len;
|
|
|
|
peers->peer[0].name.len = len;
|
|
|
|
peers->peer[0].name.data = ngx_palloc(cf->pool, len);
|
|
if (peers->peer[0].name.data == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
len = u->host.len;
|
|
|
|
ngx_memcpy(peers->peer[0].name.data, u->host.data, len);
|
|
|
|
peers->peer[0].name.data[len++] = ':';
|
|
|
|
ngx_memcpy(peers->peer[0].name.data + len,
|
|
u->port_text.data, u->port_text.len);
|
|
|
|
peers->peer[0].uri_separator = "";
|
|
}
|
|
|
|
return peers;
|
|
}
|
|
|
|
|
|
char *
|
|
ngx_inet_parse_host_port(ngx_inet_upstream_t *u)
|
|
{
|
|
size_t i;
|
|
ngx_int_t port;
|
|
ngx_str_t *url;
|
|
|
|
url = &u->url;
|
|
|
|
if (u->port_only) {
|
|
i = 0;
|
|
|
|
} else {
|
|
if (url->data[0] == ':' || url->data[0] == '/') {
|
|
return "invalid host";
|
|
}
|
|
|
|
i = 1;
|
|
}
|
|
|
|
u->host.data = url->data;
|
|
u->host_header = *url;
|
|
|
|
for (/* void */; i < url->len; i++) {
|
|
|
|
if (url->data[i] == ':') {
|
|
u->port_text.data = &url->data[i] + 1;
|
|
u->host.len = i;
|
|
|
|
if (!u->uri_part) {
|
|
u->port_text.len = &url->data[url->len] - u->port_text.data;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (url->data[i] == '/') {
|
|
u->uri.data = &url->data[i];
|
|
u->uri.len = url->len - i;
|
|
u->host_header.len = i;
|
|
|
|
if (u->host.len == 0) {
|
|
u->host.len = i;
|
|
}
|
|
|
|
if (u->port_text.data == NULL) {
|
|
u->default_port = 1;
|
|
return NULL;
|
|
}
|
|
|
|
u->port_text.len = &url->data[i] - u->port_text.data;
|
|
|
|
if (u->port_text.len == 0) {
|
|
return "invalid port";
|
|
}
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (u->port_text.data == NULL) {
|
|
port = ngx_atoi(url->data, url->len);
|
|
|
|
if (port == NGX_ERROR) {
|
|
u->default_port = 1;
|
|
u->host.len = url->len;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
u->port_text = *url;
|
|
u->wildcard = 1;
|
|
|
|
} else {
|
|
if (u->port_text.len == 0) {
|
|
return "no URI";
|
|
}
|
|
|
|
port = ngx_atoi(u->port_text.data, u->port_text.len);
|
|
|
|
if (port == NGX_ERROR || port < 1 || port > 65536) {
|
|
return "invalid port";
|
|
}
|
|
}
|
|
|
|
u->port = (in_port_t) port;
|
|
|
|
return NULL;
|
|
}
|