comparison src/http/modules/ngx_http_ssi_filter_module.c @ 1593:bef67c6abbe7

unescape SSI include
author Igor Sysoev <igor@sysoev.ru>
date Mon, 22 Oct 2007 10:19:17 +0000
parents f00b905cb70b
children e584e946e198 778fd69806fc
comparison
equal deleted inserted replaced
1592:128ea9efb824 1593:bef67c6abbe7
1856 1856
1857 static ngx_int_t 1857 static ngx_int_t
1858 ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, 1858 ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
1859 ngx_str_t **params) 1859 ngx_str_t **params)
1860 { 1860 {
1861 u_char *dst, *src;
1862 size_t len;
1861 ngx_int_t rc, key; 1863 ngx_int_t rc, key;
1862 ngx_str_t *uri, *file, *wait, *set, *stub, args; 1864 ngx_str_t *uri, *file, *wait, *set, *stub, args;
1863 ngx_buf_t *b; 1865 ngx_buf_t *b;
1864 ngx_uint_t flags, i; 1866 ngx_uint_t flags, i;
1865 ngx_chain_t *cl, *tl, **ll, *out; 1867 ngx_chain_t *cl, *tl, **ll, *out;
1925 1927
1926 if (rc != NGX_OK) { 1928 if (rc != NGX_OK) {
1927 return rc; 1929 return rc;
1928 } 1930 }
1929 1931
1932 dst = uri->data;
1933 src = uri->data;
1934
1935 ngx_unescape_uri(&dst, &src, uri->len, NGX_UNESCAPE_URI);
1936
1937 len = (uri->data + uri->len) - src;
1938 if (len) {
1939 dst = ngx_copy(dst, src, len);
1940 }
1941
1942 uri->len = dst - uri->data;
1943
1944 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1945 "ssi include: \"%V\"", uri);
1946
1930 args.len = 0; 1947 args.len = 0;
1931 args.data = NULL; 1948 args.data = NULL;
1932 flags = 0; 1949 flags = 0;
1933
1934 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1935 "ssi include: \"%V\"", uri);
1936 1950
1937 if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) { 1951 if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) {
1938 return NGX_HTTP_SSI_ERROR; 1952 return NGX_HTTP_SSI_ERROR;
1939 } 1953 }
1940 1954