summaryrefslogtreecommitdiffhomepage
path: root/src/http/ngx_http_script.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-09-07 10:01:26 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-09-07 10:01:26 +0000
commita544b2ee9858675c05d98330310b4f571ab21c66 (patch)
treec5b6986721ceb028e45217570e5f016ea18c267c /src/http/ngx_http_script.c
parent0ac11cd241b2e075eee84f6fd3967fa2b13d9694 (diff)
downloadnginx-a544b2ee9858675c05d98330310b4f571ab21c66.tar.gz
nginx-a544b2ee9858675c05d98330310b4f571ab21c66.tar.bz2
merge r2980, r2981, r2982:
win32 fixes: *) ngx_http_set_exten() is always successful since 0.3.46 *) skip URI trailing dots under Win32 *) use caseless regex locations on caseless filesystems: MacOSX, Win32, Cygwin
Diffstat (limited to 'src/http/ngx_http_script.c')
-rw-r--r--src/http/ngx_http_script.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index b8e998abb..f67c6628d 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -1074,11 +1074,7 @@ ngx_http_script_regex_end_code(ngx_http_script_engine_t *e)
return;
}
- if (ngx_http_set_exten(r) != NGX_OK) {
- e->ip = ngx_http_script_exit;
- e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
- return;
- }
+ ngx_http_set_exten(r);
}
e->ip += sizeof(ngx_http_script_regex_end_code_t);