Mercurial > hg > nginx
comparison src/http/ngx_http_variables.c @ 3580:667c22171519 stable-0.7
merge r3452, r3462, r3471, r3472:
fix miscellaneous name bugs:
*) fix $upstream_http_ variable prefix length
*) use a right "Location" header name, however, it did not harm,
since ngx_http_variable_sent_location() never use key name field
*) fix proxy_redirect name in error message
*) "proxy_redirect default" may not be used if a proxy_pass uses variables
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 07 Jun 2010 09:36:33 +0000 |
| parents | 90d746a95258 |
| children | 2d21e02fc01d |
comparison
equal
deleted
inserted
replaced
| 3579:d612c9374453 | 3580:667c22171519 |
|---|---|
| 492 } | 492 } |
| 493 | 493 |
| 494 return NULL; | 494 return NULL; |
| 495 } | 495 } |
| 496 | 496 |
| 497 if (ngx_strncmp(name->data, "upstream_http_", 10) == 0) { | 497 if (ngx_strncmp(name->data, "upstream_http_", 14) == 0) { |
| 498 | 498 |
| 499 if (ngx_http_upstream_header_variable(r, vv, (uintptr_t) name) | 499 if (ngx_http_upstream_header_variable(r, vv, (uintptr_t) name) |
| 500 == NGX_OK) | 500 == NGX_OK) |
| 501 { | 501 { |
| 502 return vv; | 502 return vv; |