Mercurial > hg > nginx-quic
comparison src/http/ngx_http_script.c @ 655:4c8cd5ae5cc1 release-0.3.49
nginx-0.3.49-RELEASE import
*) Bugfix: in the "set" directive.
*) Bugfix: if two or more FastCGI subrequests was in SSI, then first
subrequest output was included instead of second and following
subrequests.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 31 May 2006 14:11:45 +0000 |
parents | 7cbef16c71a1 |
children | 562806624c4a |
comparison
equal
deleted
inserted
replaced
654:01f41db063d4 | 655:4c8cd5ae5cc1 |
---|---|
499 if (code->n < e->ncaptures) { | 499 if (code->n < e->ncaptures) { |
500 if ((e->args || e->quote) | 500 if ((e->args || e->quote) |
501 && (e->request->quoted_uri || e->request->plus_in_uri)) | 501 && (e->request->quoted_uri || e->request->plus_in_uri)) |
502 { | 502 { |
503 return e->captures[code->n + 1] - e->captures[code->n] | 503 return e->captures[code->n + 1] - e->captures[code->n] |
504 + ngx_escape_uri(NULL, | 504 + 2 * ngx_escape_uri(NULL, |
505 &e->line.data[e->captures[code->n]], | 505 &e->line.data[e->captures[code->n]], |
506 e->captures[code->n + 1] - e->captures[code->n], | 506 e->captures[code->n + 1] - e->captures[code->n], |
507 NGX_ESCAPE_ARGS); | 507 NGX_ESCAPE_ARGS); |
508 } else { | 508 } else { |
509 return e->captures[code->n + 1] - e->captures[code->n]; | 509 return e->captures[code->n + 1] - e->captures[code->n]; |
1014 "http script complex value"); | 1014 "http script complex value"); |
1015 | 1015 |
1016 ngx_memzero(&le, sizeof(ngx_http_script_engine_t)); | 1016 ngx_memzero(&le, sizeof(ngx_http_script_engine_t)); |
1017 | 1017 |
1018 le.ip = code->lengths->elts; | 1018 le.ip = code->lengths->elts; |
1019 le.line = e->line; | |
1019 le.request = e->request; | 1020 le.request = e->request; |
1020 le.captures = e->captures; | 1021 le.captures = e->captures; |
1021 le.ncaptures = e->ncaptures; | 1022 le.ncaptures = e->ncaptures; |
1023 le.quote = e->quote; | |
1022 | 1024 |
1023 for (len = 0; *(uintptr_t *) le.ip; len += lcode(&le)) { | 1025 for (len = 0; *(uintptr_t *) le.ip; len += lcode(&le)) { |
1024 lcode = *(ngx_http_script_len_code_pt *) le.ip; | 1026 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
1025 } | 1027 } |
1026 | 1028 |