Mercurial > hg > nginx-quic
comparison src/http/ngx_http_script.c @ 3094:501fd3ae3188 stable-0.7
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
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Sep 2009 10:01:26 +0000 |
parents | 77264e0157ad |
children | 2efa8d2fcde1 |
comparison
equal
deleted
inserted
replaced
3093:5795b2710eef | 3094:501fd3ae3188 |
---|---|
1072 e->ip = ngx_http_script_exit; | 1072 e->ip = ngx_http_script_exit; |
1073 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; | 1073 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; |
1074 return; | 1074 return; |
1075 } | 1075 } |
1076 | 1076 |
1077 if (ngx_http_set_exten(r) != NGX_OK) { | 1077 ngx_http_set_exten(r); |
1078 e->ip = ngx_http_script_exit; | |
1079 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
1080 return; | |
1081 } | |
1082 } | 1078 } |
1083 | 1079 |
1084 e->ip += sizeof(ngx_http_script_regex_end_code_t); | 1080 e->ip += sizeof(ngx_http_script_regex_end_code_t); |
1085 } | 1081 } |
1086 | 1082 |