diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/http.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index fa8a6c611..9a0c86183 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix ftp URL parsing when using user + pass (#49898) + Version 12.71 - 23 October 2009 - minimal install: install packages with higher rpmsrate level only diff --git a/perl-install/install/http.pm b/perl-install/install/http.pm index 1ef8755b3..3e879a874 100644 --- a/perl-install/install/http.pm +++ b/perl-install/install/http.pm @@ -15,7 +15,7 @@ sub getFile { sub parse_http_url { my ($url) = @_; - $url =~ m,^(?:http|ftp)://([^/:]+)(?::(\d+))?(/\S*)?$,; + $url =~ m,^(?:http|ftp)://(?:[^:/]+:[^:/]+\@)?([^/:@]+)(?::(\d+))?(/\S*)?$,; } sub get_file_and_size_ { |