diff options
author | Igor Sysoev <igor@sysoev.ru> | 2006-02-03 15:58:48 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2006-02-03 15:58:48 +0300 |
commit | 8290d287b40f017404ef90dc93cc793f987d1492 (patch) | |
tree | 1f69eb2c85bb6f839ec654dd8826b9c839167e8c /src/http/modules | |
parent | 3d1679b4b03162ec477a90dce2088ab40aee830f (diff) |
nginx-0.3.26-RELEASE importrelease-0.3.26
*) 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.
Diffstat (limited to 'src/http/modules')
-rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 8 | ||||
-rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 96 | ||||
-rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.h | 5 |
3 files changed, 67 insertions, 42 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index c85f587f6..579da9465 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -442,7 +442,7 @@ static ngx_int_t 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 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) 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 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) 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 66b2b96dc..4ec674971 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 @@ ngx_http_ssi_output(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) 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 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) 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 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) 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 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) 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 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) 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 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) 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 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) /* 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 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) /* 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 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) 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 bd736480b..5337e942a 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 @@ typedef struct { ngx_uint_t output; /* unsigned output:1; */ + void *value_buf; ngx_str_t timefmt; ngx_str_t errmsg; } ngx_http_ssi_ctx_t; |