Mercurial > hg > nginx-vendor-current
comparison src/http/ngx_http_script.c @ 580:4d3e880ce86c NGINX_0_8_42
nginx 0.8.42
*) Change: now nginx tests locations given by regular expressions, if
request was matched exactly by a location given by a prefix string.
The previous behavior has been introduced in 0.7.1.
*) Feature: the ngx_http_scgi_module.
Thanks to Manlio Perillo.
*) Feature: a text answer may be added to a "return" directive.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 21 Jun 2010 00:00:00 +0400 |
| parents | 8246d8a2c2be |
| children | b6a5942a4e6a |
comparison
equal
deleted
inserted
replaced
| 579:c570633043e7 | 580:4d3e880ce86c |
|---|---|
| 1252 { | 1252 { |
| 1253 ngx_http_script_return_code_t *code; | 1253 ngx_http_script_return_code_t *code; |
| 1254 | 1254 |
| 1255 code = (ngx_http_script_return_code_t *) e->ip; | 1255 code = (ngx_http_script_return_code_t *) e->ip; |
| 1256 | 1256 |
| 1257 e->status = code->status; | 1257 if (code->status < NGX_HTTP_BAD_REQUEST |
| 1258 | 1258 || code->text.value.len |
| 1259 if (code->status == NGX_HTTP_NO_CONTENT) { | 1259 || code->text.lengths) |
| 1260 e->request->header_only = 1; | 1260 { |
| 1261 e->request->zero_body = 1; | 1261 e->status = ngx_http_send_response(e->request, code->status, NULL, |
| 1262 } | 1262 &code->text); |
| 1263 | 1263 } else { |
| 1264 e->ip += sizeof(ngx_http_script_return_code_t) - sizeof(uintptr_t); | 1264 e->status = code->status; |
| 1265 } | |
| 1266 | |
| 1267 e->ip = ngx_http_script_exit; | |
| 1265 } | 1268 } |
| 1266 | 1269 |
| 1267 | 1270 |
| 1268 void | 1271 void |
| 1269 ngx_http_script_break_code(ngx_http_script_engine_t *e) | 1272 ngx_http_script_break_code(ngx_http_script_engine_t *e) |