[PATCH 1/2] testbot/web: Use double quotes for the content-disposition filename.

[Francois Gouget]

It does not support single quotes which end up being included in the
suggested filename.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 testbot/web/GetTaskFile.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl
index 83e723e47..35f2433e7 100644
--- a/testbot/web/GetTaskFile.pl
+++ b/testbot/web/GetTaskFile.pl
@@ -49,7 +49,7 @@ sub SendTaskFile($$$$$)
     $Request->content_type("text/plain");
     $Request->headers_out->add("Content-length", $FileSize);
     $Request->headers_out->add("Content-Disposition",
-                               "attachment; filename='$File'");
+                               "attachment; filename=\"$File\"");
 
     $BlkSize ||= 16384;
     print $_ while (sysread($fh, $_, $BlkSize));
-- 
2.20.1

[PATCH 2/2] testbot/web: Include the task key in GetTaskFile's suggested filename.

[Francois Gouget]

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 testbot/web/GetTaskFile.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl
index 35f2433e7..6353219e4 100644
--- a/testbot/web/GetTaskFile.pl
+++ b/testbot/web/GetTaskFile.pl
@@ -49,7 +49,7 @@ sub SendTaskFile($$$$$)
     $Request->content_type("text/plain");
     $Request->headers_out->add("Content-length", $FileSize);
     $Request->headers_out->add("Content-Disposition",
-                               "attachment; filename=\"$File\"");
+                               "attachment; filename=\"job${JobId}_${StepNo}_${TaskNo}_$File\"");
 
     $BlkSize ||= 16384;
     print $_ while (sysread($fh, $_, $BlkSize));
-- 
2.20.1