diff options
| author |   robert <robert@openbsd.org> | 2014-03-11 15:06:22 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2014-03-11 15:06:22 +0000 |
| commit | 2c0dea59a8888833933c9c5ce851b4e6683c29d8 (patch) | |
| tree | ff27adeccd04e93621201fd5e6b79cc69d4a0015 /usr.sbin/nginx/src/http/ngx_http_upstream.c | |
| parent | Don't bitch about binding into stolen memory on older hardware either. (diff) | |
| download | wireguard-openbsd-2c0dea59a8888833933c9c5ce851b4e6683c29d8.tar.xz wireguard-openbsd-2c0dea59a8888833933c9c5ce851b4e6683c29d8.zip | |
bugfix update to 1.4.6
Diffstat (limited to 'usr.sbin/nginx/src/http/ngx_http_upstream.c')
| -rw-r--r-- | usr.sbin/nginx/src/http/ngx_http_upstream.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/nginx/src/http/ngx_http_upstream.c b/usr.sbin/nginx/src/http/ngx_http_upstream.c index 45e2eb7b961..d99d8545488 100644 --- a/usr.sbin/nginx/src/http/ngx_http_upstream.c +++ b/usr.sbin/nginx/src/http/ngx_http_upstream.c @@ -2456,14 +2456,12 @@ ngx_http_upstream_upgrade(ngx_http_request_t *r, ngx_http_upstream_t *u) if (u->peer.connection->read->ready || u->buffer.pos != u->buffer.last) { + ngx_post_event(c->read, &ngx_posted_events); ngx_http_upstream_process_upgraded(r, 1, 1); + return; } - if (c->read->ready - || r->header_in->pos != r->header_in->last) - { - ngx_http_upstream_process_upgraded(r, 0, 1); - } + ngx_http_upstream_process_upgraded(r, 0, 1); } |