output/httpd: don't warn on client disconnect

This warning should only be logged when we really received something. When the client disconnects, G_IO_IN is triggered, and the read returns G_IO_STATUS_EOF.

output/httpd: don't warn on client disconnect
b7f435b5 · Max Kellermann · d3b15f8f · b7f435b5 · b7f435b5
Commit b7f435b5 authored Aug 23, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

NEWS NEWS +1 -0

httpd_client.c src/output/httpd_client.c +8 -1

No files found.
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ ver 0.16.4 (2011/??/??)
  - vorbis: don't send end-of-stream on flush
 * output:
  - alsa: fix SIGFPE when alsa announces a period size of 0
+  - httpd: don't warn on client disconnect


 ver 0.16.3 (2011/06/04)

--- a/src/output/httpd_client.c
+++ b/src/output/httpd_client.c
@@ -370,7 +370,14 @@ httpd_client_read(struct httpd_client *client)
 	if (client->state == RESPONSE) {
 		/* the client has already sent the request, and he
 		   must not send more */
-		g_warning("unexpected input from client");
+		char buffer[1];
+
+		status = g_io_channel_read_chars(client->channel, buffer,
+						 sizeof(buffer), &bytes_read,
+						 NULL);
+		if (status == G_IO_STATUS_NORMAL)
+			g_warning("unexpected input from client");
+
 		return false;
 	}