From d96cd3ec8c0a84f88a40d63f788c56e78d92c486 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Mon, 26 Apr 2010 06:57:37 +0200 Subject: fixed vfs_curl failure after several reconnects --- plugins/vfs_curl/vfs_curl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/vfs_curl/vfs_curl.c b/plugins/vfs_curl/vfs_curl.c index 168bbb8a..94149b6a 100644 --- a/plugins/vfs_curl/vfs_curl.c +++ b/plugins/vfs_curl/vfs_curl.c @@ -638,7 +638,7 @@ http_read (void *ptr, size_t size, size_t nmemb, DB_FILE *stream) { if (sec > TIMEOUT) { trace ("http_read: timed out, restarting read\n"); memcpy (&fp->last_read_time, &tm, sizeof (struct timeval)); - fp->remaining = 0; + http_stream_reset (fp); fp->status = STATUS_SEEK; deadbeef->mutex_unlock (fp->mutex); deadbeef->streamer_reset (1); @@ -731,8 +731,7 @@ http_seek (DB_FILE *stream, int64_t offset, int whence) { } } // reset stream, and start over - fp->skipbytes = 0; - fp->remaining = 0; + http_stream_reset (fp); fp->pos = offset; fp->status = STATUS_SEEK; @@ -758,7 +757,7 @@ http_rewind (DB_FILE *stream) { if (fp->tid) { deadbeef->mutex_lock (fp->mutex); fp->status = STATUS_SEEK; - fp->remaining = 0; + http_stream_reset (fp); fp->pos = 0; deadbeef->mutex_unlock (fp->mutex); } -- cgit v1.2.3