fix bug where inputStream_httpRead was returning 0 when cnnection closed,

but data is still left in the buffer git-svn-id: https://svn.musicpd.org/mpd/trunk@1425 09075e82-0dd4-0310-85a5-a0d7c8717e4f

fix bug where inputStream_httpRead was returning 0 when cnnection closed,
051cfc22 · Warren Dukes · bfaf6cbd · 051cfc22
Commit 051cfc22 authored Jun 09, 2004 by Warren Dukes
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

inputStream_http.c src/inputStream_http.c +4 -3

No files found.
--- a/src/inputStream_http.c
+++ b/src/inputStream_http.c
@@ -490,14 +490,15 @@ size_t inputStream_httpRead(InputStream * inStream, void * ptr, size_t size,

        switch(data->connState) {
        case HTTP_CONN_STATE_OPEN:
+		if(data->prebuffer || data->buflen < data->icyMetaint) return 0;
+
+		break;
        case HTTP_CONN_STATE_CLOSED:
-                break;
+		if(data->buflen) break;
        default:
                return 0;
        }

-	if(data->prebuffer || data->buflen < data->icyMetaint) return 0;
-
 	if(data->icyMetaint > 0) {
 		if(data->icyOffset >= data->icyMetaint) {
 			int metalen = *(data->buffer);