Skip to content

Download: do not modify the caller's options record #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fingolfin wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −1
Open

Download: do not modify the caller's options record #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/download.gi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ InstallMethod( Download,
function( url, opt )
local timeout, errors, r, res;

# Do not modify the caller's record when filling in the defaults below.
opt:= ShallowCopy( opt );

# Set the default for 'verifyCert' if necessary.
if not IsBound( opt.verifyCert ) and
UserPreference( "utils", "DownloadVerifyCertificate" ) = false then
Expand Down
15 changes: 14 additions & 1 deletion tst/download.tst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#@local meths, i, urls, pair, url, expected, res1, good1, n, file, res2, good2, contents, r, res3, good3, bad, server, baseurl, iometh
#@local meths, i, urls, pair, url, expected, res1, good1, n, file, res2, good2, contents, r, res3, good3, bad, server, baseurl, iometh, opt, oldpref
############################################################################
##
#W download.tst Utils Package Thomas Breuer
Expand Down Expand Up @@ -139,6 +139,19 @@ gap> res1:= Download( url, rec( maxTime:= 5 ) );;
gap> res1.success = true;
true

## 'Download' must not modify the given options record.
## The defaults are filled in only when the preferences differ from their
## default values, hence the 'SetUserPreference' call.
gap> oldpref:= UserPreference( "utils", "DownloadMaxTime" );;
gap> SetUserPreference( "utils", "DownloadMaxTime", 30 );
gap> opt:= rec();;
gap> res1:= Download( Concatenation( baseurl, "/success" ), opt );;
gap> res1.success;
true
gap> RecNames( opt );
[ ]
gap> SetUserPreference( "utils", "DownloadMaxTime", oldpref );

## test errors and redirects
gap> res1:= Download( Concatenation( baseurl, "/missing" ) );;
gap> res1.success = false;
Expand Down