diff options
| author | Jakub Bogusz | 2004-11-21 00:50:32 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-11-29 22:58:15 (GMT) |
| commit | a14ed9b711a93133c3613339c7a908f0accf2e5b (patch) | |
| tree | 84b4155d81f55dbede342b6a23b8d9e7e2d7cf61 | |
| parent | 219df45c396a3ccc2d763c27bd315c46f1c612bc (diff) | |
| download | distfiles-a14ed9b711a93133c3613339c7a908f0accf2e5b.zip distfiles-a14ed9b711a93133c3613339c7a908f0accf2e5b.tar.gz | |
- https:// support (untested)
Changed files:
file-fetcher.pl -> 1.37
specparser.pl -> 1.11
| -rw-r--r-- | file-fetcher.pl | 4 | ||||
| -rw-r--r-- | specparser.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/file-fetcher.pl b/file-fetcher.pl index 9d64b9b..84b55b8 100644 --- a/file-fetcher.pl +++ b/file-fetcher.pl @@ -60,7 +60,7 @@ sub read_spool_file() $problems .= $_; next; } - /^([a-f0-9]{32})\s+((ftp|http|no-url|no-url-copy):\/\/([=\@\?a-z0-9A-Z:\+\~\.\-\/_]|\%[0-9])+)\s*$/ + /^([a-f0-9]{32})\s+((ftp|http|https|no-url|no-url-copy):\/\/([=\@\?a-z0-9A-Z:\+\~\.\-\/_]|\%[0-9])+)\s*$/ or die "$file: corrupted"; push @md5, $1; $url{$1} = $2; @@ -262,7 +262,7 @@ sub fetch_file($$) } else { my $testcmd = "file \"$local\" |"; my $testres = ""; - if ($url =~ /^http:/ && $local =~ /\.(tar\.(bz2|gz)|tgz|zip|jar|xpi)$/) { + if ($url =~ /^(http|https):/ && $local =~ /\.(tar\.(bz2|gz)|tgz|zip|jar|xpi)$/) { open(T, $testcmd) or die; $testres = <T>; close(T); diff --git a/specparser.pl b/specparser.pl index 3ecb168..7d36015 100644 --- a/specparser.pl +++ b/specparser.pl @@ -133,7 +133,7 @@ sub print_md5($) } elsif (defined $macro{"source_$no"}) { my $s = $macro{"source_$no"}; if ($s =~ /^([a-z0-9A-Z:\=\?\@\+\~\.\-\/_]|\%[0-9])+$/) { - if ($s =~ /^(ftp|http):\/\//) { + if ($s =~ /^(ftp|http|https):\/\//) { if ($s =~ /\/$/) { error("source $no ($s) is directory"); } else { |