Merge branch 'master' into bind-to-device-masterbind-to-device-master

1 files changed, 1 insertions, 1 deletions

diff --git a/relay.c b/relay.c
index 7331a0a..6db58ac 100644
--- a/relay.c
+++ b/relay.c
@@ -155,7 +155,7 @@ static void relay_close_if_done(struct uloop_timeout *timeout)
 
 	while (ustream_poll(&r->sfd.stream));
 
-	if (!(r->process_done || s->eof) || ustream_pending_data(s, false))
+	if (!(r->process_done || s->eof) || (ustream_pending_data(s, false) && !r->header_cb))
 		return;
 
 	uh_relay_close(r, r->ret);