Merge tag 'v0.19.10'

This commit is contained in:
Max Kellermann
2015-06-21 16:01:44 +02:00
11 changed files with 108 additions and 16 deletions

View File

@@ -453,6 +453,8 @@ CurlInputStream::RequestDone(CURLcode result, long status)
SeekDone();
else if (!IsReady())
SetReady();
else
cond.broadcast();
}
static void

View File

@@ -132,6 +132,7 @@ SmbclientInputStream::Read(void *ptr, size_t read_size, Error &error)
nbytes = 0;
}
offset += nbytes;
return nbytes;
}