summaryrefslogtreecommitdiffstats
path: root/usr.sbin/nginx/src/http/ngx_http_upstream.c
diff options
context:
space:
mode:
authorrobert <robert@openbsd.org>2012-01-05 12:28:58 +0000
committerrobert <robert@openbsd.org>2012-01-05 12:28:58 +0000
commit79a58b938f55fd9f7302ccafddf487453d11fb74 (patch)
tree3d175cfbdd2d88c13319b2e008ebeb391a6857b5 /usr.sbin/nginx/src/http/ngx_http_upstream.c
parentFix typos in comment (s,exacty,exactly,) (diff)
downloadwireguard-openbsd-79a58b938f55fd9f7302ccafddf487453d11fb74.tar.xz
wireguard-openbsd-79a58b938f55fd9f7302ccafddf487453d11fb74.zip
update to nginx-1.0.11
Diffstat (limited to 'usr.sbin/nginx/src/http/ngx_http_upstream.c')
-rw-r--r--usr.sbin/nginx/src/http/ngx_http_upstream.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/usr.sbin/nginx/src/http/ngx_http_upstream.c b/usr.sbin/nginx/src/http/ngx_http_upstream.c
index 5aa96a4258c..99b252ebbfd 100644
--- a/usr.sbin/nginx/src/http/ngx_http_upstream.c
+++ b/usr.sbin/nginx/src/http/ngx_http_upstream.c
@@ -2888,6 +2888,7 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
#endif
ngx_close_connection(u->peer.connection);
+ u->peer.connection = NULL;
}
#if 0
@@ -4279,6 +4280,10 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
continue;
}
+ if (flags & NGX_HTTP_UPSTREAM_CREATE) {
+ uscfp[i]->flags = flags;
+ }
+
return uscfp[i];
}