Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/0.6' into release/0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
beef9999 committed Nov 17, 2023
2 parents 9245e93 + b07b723 commit fd5b957
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.linux.arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ jobs:
- name: Test
run: |
cd build
ctest --timeout 3600 -V
ctest --timeout 3600 -V
3 changes: 1 addition & 2 deletions fs/httpfs/httpfs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@ class HttpFile : public fs::VirtualReadOnlyFile {
VALUE(url), VALUE(offset), VALUE(ret));
}
authorized = true;
headers.try_get("content-length", ret);
return ret;
return writer.written;
}

int fstat(struct stat* buf) override {
Expand Down
2 changes: 2 additions & 0 deletions net/curl.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,11 @@ class StringWriter {
struct IOVWriter : public IOVector {
using IOVector::IOVector;
size_t drop = 0;
size_t written = 0;
size_t write(const void* buf, size_t size) {
auto actual_count = memcpy_from(
buf, size); // copy from (buf, size) to iovec[] in *this,
written += actual_count;
extract_front(actual_count); // and extract the portion just copied
if (actual_count < size) // means full
{
Expand Down

0 comments on commit fd5b957

Please sign in to comment.