summaryrefslogtreecommitdiffstats
path: root/usr.sbin/nginx/src/http/ngx_http_spdy.c
diff options
context:
space:
mode:
authorrobert <robert@openbsd.org>2013-10-18 17:25:09 +0000
committerrobert <robert@openbsd.org>2013-10-18 17:25:09 +0000
commit1fe323373e56c7762fbda17c9aa63b84616dec7d (patch)
tree6b99ba83a71cda9154af697cab7911696bf93bad /usr.sbin/nginx/src/http/ngx_http_spdy.c
parentI forget to enable edma when I import it. (diff)
downloadwireguard-openbsd-1fe323373e56c7762fbda17c9aa63b84616dec7d.tar.xz
wireguard-openbsd-1fe323373e56c7762fbda17c9aa63b84616dec7d.zip
bugfix update to 1.4.3
Diffstat (limited to 'usr.sbin/nginx/src/http/ngx_http_spdy.c')
-rw-r--r--usr.sbin/nginx/src/http/ngx_http_spdy.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/usr.sbin/nginx/src/http/ngx_http_spdy.c b/usr.sbin/nginx/src/http/ngx_http_spdy.c
index 3febc23e972..7c93dc49a07 100644
--- a/usr.sbin/nginx/src/http/ngx_http_spdy.c
+++ b/usr.sbin/nginx/src/http/ngx_http_spdy.c
@@ -2529,13 +2529,6 @@ ngx_http_spdy_init_request_body(ngx_http_request_t *r)
return NGX_ERROR;
}
- if (rb->rest == 0) {
- buf->in_file = 1;
- buf->file = &tf->file;
- } else {
- rb->buf = buf;
- }
-
} else {
if (rb->rest == 0) {
@@ -2546,10 +2539,10 @@ ngx_http_spdy_init_request_body(ngx_http_request_t *r)
if (buf == NULL) {
return NGX_ERROR;
}
-
- rb->buf = buf;
}
+ rb->buf = buf;
+
rb->bufs = ngx_alloc_chain_link(r->pool);
if (rb->bufs == NULL) {
return NGX_ERROR;