IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix r2394

Browse Source
This commit is contained in:
Igor Sysoev 2008-12-11 06:38:14 +00:00
parent 0c54fef3e0
commit 0e17953679
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/http/ngx_http_script.c
View File

@ -620,7 +620,7 @@ ngx_http_script_regex_start_code(ngx_http_script_engine_t *e)
rc = ngx_regex_exec(code->regex, &e->line, e->captures, code->ncaptures); rc = ngx_regex_exec(code->regex, &e->line, e->captures, code->ncaptures);
if (rc == NGX_REGEX_NO_MATCHED) { if (rc == NGX_REGEX_NO_MATCHED) {
if (e->log) { if (e->log || (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP)) {
ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0, ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0,
"\"%V\" does not match \"%V\"", "\"%V\" does not match \"%V\"",
&code->name, &e->line); &code->name, &e->line);
@ -658,7 +658,7 @@ ngx_http_script_regex_start_code(ngx_http_script_engine_t *e)
return; return;
} }
if (e->log) { if (e->log || (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP)) {
ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0, ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0,
"\"%V\" matches \"%V\"", &code->name, &e->line); "\"%V\" matches \"%V\"", &code->name, &e->line);
} }
@ -794,15 +794,10 @@ ngx_http_script_regex_end_code(ngx_http_script_engine_t *e)
e->buf.len = e->pos - e->buf.data; e->buf.len = e->pos - e->buf.data;
#if (NGX_DEBUG) if (e->log || (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP)) {
ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0,
"rewritten redirect: \"%V\"", &e->buf);
#else
if (e->log) {
ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0, ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0,
"rewritten redirect: \"%V\"", &e->buf); "rewritten redirect: \"%V\"", &e->buf);
} }
#endif
r->headers_out.location = ngx_list_push(&r->headers_out.headers); r->headers_out.location = ngx_list_push(&r->headers_out.headers);
if (r->headers_out.location == NULL) { if (r->headers_out.location == NULL) {
@ -841,16 +836,11 @@ ngx_http_script_regex_end_code(ngx_http_script_engine_t *e)
} }
} }
#if (NGX_DEBUG) if (e->log || (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP)) {
ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0,
"rewritten data: \"%V\", args: \"%V\"", &e->buf, &r->args);
#else
if (e->log) {
ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0, ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0,
"rewritten data: \"%V\", args: \"%V\"", "rewritten data: \"%V\", args: \"%V\"",
&e->buf, &r->args); &e->buf, &r->args);
} }
#endif
if (code->uri) { if (code->uri) {
r->uri = e->buf; r->uri = e->buf;