diff options
| author | Max Kellermann <max@duempel.org> | 2015-06-21 16:01:44 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-06-21 16:06:02 +0200 |
| commit | 90e7ace980fcfe4f894cd8e882fbfd2efba0b57d (patch) | |
| tree | b4810dd7c6fb09329e0e2c986aa2e0c6cae579fd /src/input | |
| parent | 2b0a127fa565c3e78d3a1e11f0fc68547dc5a161 (diff) | |
| parent | b0ff3bc7a30674fe44e946e228e8c2facd8e8377 (diff) | |
Merge tag 'v0.19.10'
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/plugins/CurlInputPlugin.cxx | 2 | ||||
| -rw-r--r-- | src/input/plugins/SmbclientInputPlugin.cxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index fb5845b2b..ade8324ec 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -453,6 +453,8 @@ CurlInputStream::RequestDone(CURLcode result, long status) SeekDone(); else if (!IsReady()) SetReady(); + else + cond.broadcast(); } static void diff --git a/src/input/plugins/SmbclientInputPlugin.cxx b/src/input/plugins/SmbclientInputPlugin.cxx index 6aab556f2..ec6857c19 100644 --- a/src/input/plugins/SmbclientInputPlugin.cxx +++ b/src/input/plugins/SmbclientInputPlugin.cxx @@ -132,6 +132,7 @@ SmbclientInputStream::Read(void *ptr, size_t read_size, Error &error) nbytes = 0; } + offset += nbytes; return nbytes; } |