diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-09-06 16:09:32 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-09-06 16:09:32 +0000 |
| commit | ceb992921cee6f76d1752af2d388ee6a1d71e078 (patch) | |
| tree | 2b4916a12d02210134939b7fb388a270e76002fa /src/http/modules/ngx_http_proxy_module.c | |
| parent | 5650106a09de8e8d876ed38fbff57b2161d910c4 (diff) | |
| download | nginx-ceb992921cee6f76d1752af2d388ee6a1d71e078.tar.gz nginx-ceb992921cee6f76d1752af2d388ee6a1d71e078.zip | |
nginx-0.1.44-RELEASE importrelease-0.1.44
*) Feature: the IMAP/POP3 proxy supports SSL.
*) Feature: the "proxy_timeout" directive of the ngx_imap_proxy_module.
*) Feature: the "userid_mark" directive.
*) Feature: the $remote_user variable value is determined independently
of authorization use.
Diffstat (limited to 'src/http/modules/ngx_http_proxy_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index 8288df1c4..e8b9c4ee9 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -424,10 +424,10 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) escape = 0; - loc_len = r->valid_location ? u->conf->location->len : 1; + loc_len = r->valid_location ? u->conf->location->len - 1 : 0; if (plcf->upstream.pass_unparsed_uri && r->valid_unparsed_uri) { - len += r->unparsed_uri.len - 1; + len += r->unparsed_uri.len; } else { if (r->quoted_uri) { @@ -508,11 +508,11 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) r->method_name.len + 1); } - b->last = ngx_cpymem(b->last, u->conf->uri.data, u->conf->uri.len); + b->last = ngx_cpymem(b->last, u->conf->uri.data, u->conf->uri.len - 1); if (plcf->upstream.pass_unparsed_uri && r->valid_unparsed_uri) { - b->last = ngx_cpymem(b->last, r->unparsed_uri.data + 1, - r->unparsed_uri.len - 1); + b->last = ngx_cpymem(b->last, r->unparsed_uri.data, + r->unparsed_uri.len); } else { if (escape) { ngx_escape_uri(b->last, r->uri.data + loc_len, |