summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRoland Reichwein <mail@reichwein.it>2020-06-26 11:15:44 +0200
committerRoland Reichwein <mail@reichwein.it>2020-06-26 11:15:44 +0200
commitef63da27938ae091a341893c38e59d489888625a (patch)
tree7084463bf9970b62aa9b31b18d248f6a7c9f9d6a
parent4eff7b12cb3415ba4c04d5f5d2a4d189552d318e (diff)
webserver 1.11: Fix archive download in webbox
-rw-r--r--debian/changelog6
-rw-r--r--plugins/webbox/webbox.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 03ddeb2..954078d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+webserver (1.11) unstable; urgency=medium
+
+ * Bugfix: ZIP download in webbox was broken
+
+ -- Roland Reichwein <rr@antcom.de> Fri, 26 Jun 2020 11:15:36 +0200
+
webserver (1.10) unstable; urgency=medium
* More runtime error checking
diff --git a/plugins/webbox/webbox.cpp b/plugins/webbox/webbox.cpp
index 37ddde2..d19f428 100644
--- a/plugins/webbox/webbox.cpp
+++ b/plugins/webbox/webbox.cpp
@@ -513,7 +513,7 @@ protected:
Tempfile tempfile; // guards this path, removing file afterwards via RAII
- arglist = "/usr/bin/zip -r "s + tempfile.GetPath().string() + " "s + arglist;
+ arglist = "/usr/bin/zip -r - "s + arglist + " > "s + tempfile.GetPath().string();
int system_result {system(arglist.c_str())};
if (system_result != 0) {