nginx-0.3.26-RELEASE import
*) Change: the "optimize_host_names" directive was renamed to the
"optimize_server_names".
*) Bugfix: if in the "proxy_pass" directive was no the URI part, then
the main request URI was transferred to a backend while proxying the
SSI subrequest.
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index c85f587..579da94 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -442,7 +442,7 @@
ngx_http_proxy_create_request(ngx_http_request_t *r)
{
size_t len, loc_len, body_len;
- ngx_uint_t i, key;
+ ngx_uint_t i, key, unparsed_uri;
uintptr_t escape;
ngx_buf_t *b;
ngx_str_t *hh, method;
@@ -488,10 +488,12 @@
loc_len = r->valid_location ? u->conf->location.len : 0;
- if (u->conf->uri.len == 0 && r->valid_unparsed_uri) {
+ if (u->conf->uri.len == 0 && r->valid_unparsed_uri && r == r->main) {
+ unparsed_uri = 1;
len += r->unparsed_uri.len;
} else {
+ unparsed_uri = 0;
if (r->quoted_uri) {
escape = 2 * ngx_escape_uri(NULL, r->uri.data + loc_len,
r->uri.len - loc_len, NGX_ESCAPE_URI);
@@ -581,7 +583,7 @@
u->uri.data = b->last;
- if (u->conf->uri.len == 0 && r->valid_unparsed_uri) {
+ if (unparsed_uri) {
b->last = ngx_copy(b->last, r->unparsed_uri.data, r->unparsed_uri.len);
} else {
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index 66b2b96..4ec6749 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -761,7 +761,7 @@
static ngx_int_t
ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx)
{
- u_char *p, *last, *copy_end, ch;
+ u_char *p, *value, *last, *copy_end, ch;
size_t looked;
ngx_http_ssi_state_e state;
@@ -914,12 +914,13 @@
default:
ctx->command.len = 1;
ctx->command.data = ngx_palloc(r->pool,
- NGX_HTTP_SSI_COMMAND_LEN + 1);
+ NGX_HTTP_SSI_COMMAND_LEN);
if (ctx->command.data == NULL) {
return NGX_ERROR;
}
ctx->command.data[0] = ch;
+
ctx->key = 0;
ctx->key = ngx_hash(ctx->key, ch);
@@ -944,17 +945,17 @@
break;
default:
- ctx->command.data[ctx->command.len++] = ch;
- ctx->key = ngx_hash(ctx->key, ch);
-
if (ctx->command.len == NGX_HTTP_SSI_COMMAND_LEN) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "the \"%V\" SSI command is too long",
- &ctx->command);
+ "the \"%V%c...\" SSI command is too long",
+ &ctx->command, ch);
state = ssi_error_state;
break;
}
+
+ ctx->command.data[ctx->command.len++] = ch;
+ ctx->key = ngx_hash(ctx->key, ch);
}
break;
@@ -979,7 +980,7 @@
ctx->param->key.len = 1;
ctx->param->key.data = ngx_palloc(r->pool,
- NGX_HTTP_SSI_PARAM_LEN + 1);
+ NGX_HTTP_SSI_PARAM_LEN);
if (ctx->param->key.data == NULL) {
return NGX_ERROR;
}
@@ -987,10 +988,16 @@
ctx->param->key.data[0] = ch;
ctx->param->value.len = 0;
- ctx->param->value.data = ngx_palloc(r->pool,
- ctx->value_len + 1);
- if (ctx->param->value.data == NULL) {
- return NGX_ERROR;
+
+ if (ctx->value_buf == NULL) {
+ ctx->param->value.data = ngx_palloc(r->pool,
+ ctx->value_len);
+ if (ctx->param->value.data == NULL) {
+ return NGX_ERROR;
+ }
+
+ } else {
+ ctx->param->value.data = ctx->value_buf;
}
state = ssi_param_state;
@@ -1022,16 +1029,16 @@
break;
default:
- ctx->param->key.data[ctx->param->key.len++] = ch;
-
if (ctx->param->key.len == NGX_HTTP_SSI_PARAM_LEN) {
state = ssi_error_state;
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "too long \"%V\" parameter in "
+ "too long \"%V%c...\" parameter in "
"\"%V\" SSI command",
- &ctx->param->key, &ctx->command);
+ &ctx->param->key, ch, &ctx->command);
break;
}
+
+ ctx->param->key.data[ctx->param->key.len++] = ch;
}
break;
@@ -1109,17 +1116,17 @@
/* fall through */
default:
- ctx->param->value.data[ctx->param->value.len++] = ch;
-
if (ctx->param->value.len == ctx->value_len) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "too long \"%V\" value of \"%V\" parameter "
- "in \"%V\" SSI command",
- &ctx->param->value, &ctx->param->key,
+ "too long \"%V%c...\" value of \"%V\" "
+ "parameter in \"%V\" SSI command",
+ &ctx->param->value, ch, &ctx->param->key,
&ctx->command);
state = ssi_error_state;
break;
}
+
+ ctx->param->value.data[ctx->param->value.len++] = ch;
}
break;
@@ -1137,17 +1144,17 @@
/* fall through */
default:
- ctx->param->value.data[ctx->param->value.len++] = ch;
-
if (ctx->param->value.len == ctx->value_len) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "too long \"%V\" value of \"%V\" parameter "
- "in \"%V\" SSI command",
- &ctx->param->value, &ctx->param->key,
+ "too long \"%V%c...\" value of \"%V\" "
+ "parameter in \"%V\" SSI command",
+ &ctx->param->value, ch, &ctx->param->key,
&ctx->command);
state = ssi_error_state;
break;
}
+
+ ctx->param->value.data[ctx->param->value.len++] = ch;
}
break;
@@ -1169,23 +1176,38 @@
break;
}
- ctx->param->value.data[ctx->param->value.len++] = ch;
-
if (ctx->param->value.len == ctx->value_len) {
- if (ctx->param->value.len == ctx->value_len) {
- ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "too long \"%V\" value of \"%V\" parameter "
- "in \"%V\" SSI command",
- &ctx->param->value, &ctx->param->key,
- &ctx->command);
- state = ssi_error_state;
- break;
- }
+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+ "too long \"%V%c...\" value of \"%V\" "
+ "parameter in \"%V\" SSI command",
+ &ctx->param->value, ch, &ctx->param->key,
+ &ctx->command);
+ state = ssi_error_state;
+ break;
}
+ ctx->param->value.data[ctx->param->value.len++] = ch;
+
break;
case ssi_postparam_state:
+
+ if (ctx->param->value.len < ctx->value_len / 2) {
+ value = ngx_palloc(r->pool, ctx->param->value.len);
+ if (value == NULL) {
+ return NGX_ERROR;
+ }
+
+ ngx_memcpy(value, ctx->param->value.data,
+ ctx->param->value.len);
+
+ ctx->value_buf = ctx->param->value.data;
+ ctx->param->value.data = value;
+
+ } else {
+ ctx->value_buf = NULL;
+ }
+
switch (ch) {
case ' ':
case CR:
diff --git a/src/http/modules/ngx_http_ssi_filter_module.h b/src/http/modules/ngx_http_ssi_filter_module.h
index bd73648..5337e94 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.h
+++ b/src/http/modules/ngx_http_ssi_filter_module.h
@@ -15,8 +15,8 @@
#define NGX_HTTP_SSI_MAX_PARAMS 16
-#define NGX_HTTP_SSI_COMMAND_LEN 31
-#define NGX_HTTP_SSI_PARAM_LEN 31
+#define NGX_HTTP_SSI_COMMAND_LEN 32
+#define NGX_HTTP_SSI_PARAM_LEN 32
#define NGX_HTTP_SSI_PARAMS_N 4
@@ -56,6 +56,7 @@
ngx_uint_t output; /* unsigned output:1; */
+ void *value_buf;
ngx_str_t timefmt;
ngx_str_t errmsg;
} ngx_http_ssi_ctx_t;
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 61f9430..6211f0e 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -535,7 +535,7 @@
* check whether all name-based servers have the same configuraiton
* as the default server,
* or some servers restrict the host names,
- * or some servers disable optimizing the host names
+ * or some servers disable optimizing the server names
*/
in_addr = in_port[p].addrs.elts;
@@ -545,7 +545,7 @@
for (s = 0; s < in_addr[a].names.nelts; s++) {
if (in_addr[a].core_srv_conf != name[s].core_srv_conf
- || name[s].core_srv_conf->optimize_host_names == 0
+ || name[s].core_srv_conf->optimize_server_names == 0
|| name[s].core_srv_conf->restrict_host_names
!= NGX_HTTP_RESTRICT_HOST_OFF)
{
@@ -557,7 +557,7 @@
* if all name-based servers have the same configuration
* as the default server,
* and no servers restrict the host names,
- * and no servers disable optimizing the host names
+ * and no servers disable optimizing the server names
* then we do not need to check them at run-time at all
*/
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 2784921..89f846c 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -62,6 +62,10 @@
static ngx_conf_post_t ngx_http_core_lowat_post =
{ ngx_http_core_lowat_check };
+static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_host_names = {
+ ngx_conf_deprecated, "optimize_host_names", "optimize_server_names"
+};
+
static ngx_conf_enum_t ngx_http_restrict_host_names[] = {
{ ngx_string("off"), NGX_HTTP_RESTRICT_HOST_OFF },
@@ -136,12 +140,19 @@
offsetof(ngx_http_core_srv_conf_t, restrict_host_names),
&ngx_http_restrict_host_names },
+ { ngx_string("optimize_server_names"),
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+ ngx_conf_set_flag_slot,
+ NGX_HTTP_SRV_CONF_OFFSET,
+ offsetof(ngx_http_core_srv_conf_t, optimize_server_names),
+ NULL },
+
{ ngx_string("optimize_host_names"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_SRV_CONF_OFFSET,
- offsetof(ngx_http_core_srv_conf_t, optimize_host_names),
- NULL },
+ offsetof(ngx_http_core_srv_conf_t, optimize_server_names),
+ &ngx_conf_deprecated_optimize_host_names },
{ ngx_string("ignore_invalid_headers"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
@@ -1840,7 +1851,7 @@
cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
cscf->restrict_host_names = NGX_CONF_UNSET_UINT;
- cscf->optimize_host_names = NGX_CONF_UNSET;
+ cscf->optimize_server_names = NGX_CONF_UNSET;
cscf->ignore_invalid_headers = NGX_CONF_UNSET;
return cscf;
@@ -1928,8 +1939,8 @@
ngx_conf_merge_unsigned_value(conf->restrict_host_names,
prev->restrict_host_names, 0);
- ngx_conf_merge_value(conf->optimize_host_names,
- prev->optimize_host_names, 1);
+ ngx_conf_merge_value(conf->optimize_server_names,
+ prev->optimize_server_names, 1);
ngx_conf_merge_value(conf->ignore_invalid_headers,
prev->ignore_invalid_headers, 1);
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 48cbc42..4382289 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -109,7 +109,7 @@
ngx_uint_t restrict_host_names;
- ngx_flag_t optimize_host_names;
+ ngx_flag_t optimize_server_names;
ngx_flag_t ignore_invalid_headers;
} ngx_http_core_srv_conf_t;
