diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-10-03 16:53:14 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-10-03 16:53:14 +0400 |
commit | 82dc95eadd3f9cca3619f1797d91ffd751f422ea (patch) | |
tree | 4e375369da607f1155b48279281b73afea4fa23e /src/http/modules | |
parent | 23d23c1e8ecc390ca403e1234a22f4291ee38b23 (diff) |
nginx-0.2.4-RELEASE importrelease-0.2.4
*) Feature: the ngx_http_ssi_module supports "$var=text", "$var!=text",
"$var=/text/", and "$var!=/text/" expressions in the "if" command.
*) Bugfix: in proxying location without trailing slash; the bug had
appeared in 0.1.44.
*) Bugfix: the segmentation fault may occurred if the "rtsig" method
was used; the bug had appeared in 0.2.0.
Diffstat (limited to 'src/http/modules')
-rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 6 | ||||
-rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 134 |
2 files changed, 131 insertions, 9 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index a7fd74172..fd41017d3 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -430,7 +430,7 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) escape = 0; - loc_len = r->valid_location ? u->conf->location->len - 1 : 0; + loc_len = r->valid_location ? u->conf->location->len : 0; if (plcf->upstream.pass_unparsed_uri && r->valid_unparsed_uri) { len += r->unparsed_uri.len; @@ -514,12 +514,12 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) r->method_name.len + 1); } - b->last = ngx_cpymem(b->last, u->conf->uri.data, u->conf->uri.len - 1); - if (plcf->upstream.pass_unparsed_uri && r->valid_unparsed_uri) { b->last = ngx_cpymem(b->last, r->unparsed_uri.data, r->unparsed_uri.len); } else { + b->last = ngx_cpymem(b->last, u->conf->uri.data, u->conf->uri.len); + if (escape) { ngx_escape_uri(b->last, r->uri.data + loc_len, r->uri.len - loc_len, NGX_ESCAPE_URI); diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c index f3eb093d3..885d29817 100644 --- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -1603,9 +1603,16 @@ static ngx_int_t ngx_http_ssi_if(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, ngx_str_t **params) { - ngx_str_t *expr, var; - ngx_uint_t i; + u_char *p, *last; + ngx_str_t *expr, var, left, right; + ngx_int_t rc; + ngx_uint_t negative, noregex; ngx_http_variable_value_t *vv; +#if (NGX_PCRE) + ngx_str_t err; + ngx_regex_t *regex; + u_char errstr[NGX_MAX_CONF_ERRSTR]; +#endif expr = params[NGX_HTTP_SSI_IF_EXPR]; @@ -1615,11 +1622,26 @@ ngx_http_ssi_if(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, return NGX_HTTP_SSI_ERROR; } - var.len = expr->len - 1; var.data = expr->data + 1; + last = expr->data + expr->len; + + for (p = var.data; p < last; p++) { + if (*p >= 'A' && *p <= 'Z') { + *p |= 0x20; + continue; + } + + if ((*p >= 'a' && *p <= 'z') || (*p >= '0' && *p <= '9') || *p == '_') { + continue; + } - for (i = 0; i < var.len; i++) { - var.data[i] = ngx_tolower(var.data[i]); + break; + } + + var.len = p - var.data; + + while (p < last && *p == ' ') { + p++; } vv = ngx_http_get_variable(r, &var); @@ -1628,7 +1650,100 @@ ngx_http_ssi_if(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, return NGX_HTTP_SSI_ERROR; } - if (vv != NGX_HTTP_VAR_NOT_FOUND && vv->text.len != 0) { + if (p == last) { + if (vv != NGX_HTTP_VAR_NOT_FOUND && vv->text.len != 0) { + ctx->output = 1; + + } else { + ctx->output = 0; + } + + return NGX_OK; + } + + if (p < last && *p == '=') { + negative = 0; + p++; + + } else if (p + 1 < last && *p == '!' && *(p + 1) == '=') { + negative = 1; + p += 2; + + } else { + goto invalid_expression; + } + + while (p < last && *p == ' ') { + p++; + } + + if (p < last && *p == '/') { + if (*(last - 1) != '/') { + goto invalid_expression; + } + + noregex = 0; + last--; + p++; + + } else { + noregex = 1; + } + + right.len = last - p; + right.data = p; + + if (vv == NGX_HTTP_VAR_NOT_FOUND) { + left.len = 0; + left.data = (u_char *) ""; + + } else { + left = vv->text; + } + + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "left: \"%V\" right: \"%V\"", &left, &right); + + if (noregex) { + if (left.len != right.len) { + rc = -1; + + } else { + rc = ngx_strncmp(left.data, right.data, right.len); + } + + } else { +#if (NGX_PCRE) + err.len = NGX_MAX_CONF_ERRSTR; + err.data = errstr; + + right.data[right.len] = '\0'; + + regex = ngx_regex_compile(&right, 0, r->pool, &err); + + if (regex == NULL) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "%s", err.data); + return NGX_HTTP_SSI_ERROR; + } + + rc = ngx_regex_exec(regex, &left, NULL, 0); + + if (rc != NGX_REGEX_NO_MATCHED && rc < 0) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, + ngx_regex_exec_n " failed: %d on \"%V\" using \"%V\"", + rc, &left, &right); + return NGX_HTTP_SSI_ERROR; + } +#else + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, + "the using of the regex \"%V\" in SSI " + "requires PCRE library", &right); + + return NGX_HTTP_SSI_ERROR; +#endif + } + + if ((rc == 0 && !negative) || (rc != 0 && negative)) { ctx->output = 1; } else { @@ -1636,6 +1751,13 @@ ngx_http_ssi_if(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, } return NGX_OK; + +invalid_expression: + + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "invalid expression in \"%V\"", expr); + + return NGX_HTTP_SSI_ERROR; } |