diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2013-12-23 18:12:00 +0400 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2013-12-23 18:12:00 +0400 |
| commit | f7ff5e65d0d20ba0425be7e3d8de4d04ceec9206 (patch) | |
| tree | dd55a2892d27b25983e8a954319f499678f77eaf /src/http/modules | |
| parent | 336bcb22d19ff67a696a2a8a3aaa1210169ecdc7 (diff) | |
| download | nginx-f7ff5e65d0d20ba0425be7e3d8de4d04ceec9206.tar.gz nginx-f7ff5e65d0d20ba0425be7e3d8de4d04ceec9206.tar.bz2 | |
Teach ngx_http_parse_unsafe_uri() how to unescape URIs.
This fixes handling of escaped URIs in X-Accel-Redirect (ticket #316),
SSI (ticket #240), and DAV.
Diffstat (limited to 'src/http/modules')
| -rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c index c70b17e09..a53cd1472 100644 --- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -1982,8 +1982,6 @@ static ngx_int_t ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, ngx_str_t **params) { - u_char *dst, *src; - size_t len; ngx_int_t rc, key; ngx_str_t *uri, *file, *wait, *set, *stub, args; ngx_buf_t *b; @@ -2054,18 +2052,6 @@ ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, return rc; } - dst = uri->data; - src = uri->data; - - ngx_unescape_uri(&dst, &src, uri->len, NGX_UNESCAPE_URI); - - len = (uri->data + uri->len) - src; - if (len) { - dst = ngx_movemem(dst, src, len); - } - - uri->len = dst - uri->data; - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "ssi include: \"%V\"", uri); |