diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2010-07-02 12:24:09 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2010-07-02 12:24:09 +0000 |
| commit | 7c6ee5858f54858b7fdd83fc1f6eef5dee8f549b (patch) | |
| tree | 99f1f70e5e9f8853e00165e272d428e3065e3ed1 | |
| parent | f63cc59b9a87e8eceecaaffb7b38013ca09892ec (diff) | |
| download | drakx-7c6ee5858f54858b7fdd83fc1f6eef5dee8f549b.tar drakx-7c6ee5858f54858b7fdd83fc1f6eef5dee8f549b.tar.gz drakx-7c6ee5858f54858b7fdd83fc1f6eef5dee8f549b.tar.bz2 drakx-7c6ee5858f54858b7fdd83fc1f6eef5dee8f549b.tar.xz drakx-7c6ee5858f54858b7fdd83fc1f6eef5dee8f549b.zip | |
accept https URL in install::http
| -rw-r--r-- | perl-install/Makefile.config | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/install/http.pm | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 8fa2c579f..2a58e3a37 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=13.36 +VERSION:=13.37 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d2347b6ba..a74e9af2d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +Version 13.37 - 2 July 2010 + +- accept https URL in install::http + Version 13.36 - 30 June 2010 - final banner diff --git a/perl-install/install/http.pm b/perl-install/install/http.pm index caea04c3d..cf6c78f69 100644 --- a/perl-install/install/http.pm +++ b/perl-install/install/http.pm @@ -16,7 +16,7 @@ sub getFile { sub parse_http_url { my ($url) = @_; - $url =~ m,^(?:http|ftp)://(?:[^:/]+:[^:/]+\@)?([^/:@]+)(?::(\d+))?(/\S*)?$,; + $url =~ m,^(?:https?|ftp)://(?:[^:/]+:[^:/]+\@)?([^/:@]+)(?::(\d+))?(/\S*)?$,; } sub get_file_and_size_ { |