summaryrefslogtreecommitdiffhomepage
path: root/src/http/ngx_http_parse.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-10-26 17:45:55 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-10-26 17:45:55 +0000
commit8232053651ecd9d2029e080bf93eb66f27f1d2f3 (patch)
treeb4ab7e09ef76c8f7bb74b45414af6a44c6847496 /src/http/ngx_http_parse.c
parent5aa449e8ffae59f0dfdc73485971a51258391eed (diff)
downloadnginx-8232053651ecd9d2029e080bf93eb66f27f1d2f3.tar.gz
nginx-8232053651ecd9d2029e080bf93eb66f27f1d2f3.tar.bz2
merge r3162, r3183:
WebDAV fixes: *) check unsafe Destination *) omit '\0' from "Location" header on MKCOL request
Diffstat (limited to '')
-rw-r--r--src/http/ngx_http_parse.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index d2abaa708..b638f86fc 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -1322,8 +1322,10 @@ ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri,
unsafe:
- ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "unsafe URI \"%V\" was detected", uri);
+ if (*flags & NGX_HTTP_LOG_UNSAFE) {
+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+ "unsafe URI \"%V\" was detected", uri);
+ }
return NGX_ERROR;
}