summaryrefslogtreecommitdiffhomepage
path: root/src/http/ngx_http_upstream.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-10-26 17:09:27 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-10-26 17:09:27 +0000
commit6118897e3388e4db5d693f27ac4c7312e07f3d12 (patch)
tree0228aaa538e452a4a655648d51fe06e97820bb52 /src/http/ngx_http_upstream.h
parentf3c5789e7d3ad2e124079c388ee90c6d54c18495 (diff)
downloadnginx-6118897e3388e4db5d693f27ac4c7312e07f3d12.tar.gz
nginx-6118897e3388e4db5d693f27ac4c7312e07f3d12.tar.bz2
merge r3001, r3007, r3013:
fix variuos segfaults: *) fix segfault if 400 or 414 errors are handled intricately *) ngx_http_upstream_create() to cleanup the previous upstream after internal redirect
Diffstat (limited to '')
-rw-r--r--src/http/ngx_http_upstream.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index fc777670e..ac2682d6f 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -317,6 +317,7 @@ typedef struct {
ngx_int_t ngx_http_upstream_header_variable(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data);
+ngx_int_t ngx_http_upstream_create(ngx_http_request_t *r);
void ngx_http_upstream_init(ngx_http_request_t *r);
ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf,
ngx_url_t *u, ngx_uint_t flags);