diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-10-27 10:29:20 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-10-27 10:29:20 +0000 |
| commit | 3738a03d0b17123578001082d47ccd8b749293f6 (patch) | |
| tree | 907440b031802333bf78ca32764d4fa4a9242b17 /perl-install/install | |
| parent | e490a4f98da664b987d0b20e7eb387f49f08c092 (diff) | |
| download | drakx-backup-do-not-use-3738a03d0b17123578001082d47ccd8b749293f6.tar drakx-backup-do-not-use-3738a03d0b17123578001082d47ccd8b749293f6.tar.gz drakx-backup-do-not-use-3738a03d0b17123578001082d47ccd8b749293f6.tar.bz2 drakx-backup-do-not-use-3738a03d0b17123578001082d47ccd8b749293f6.tar.xz drakx-backup-do-not-use-3738a03d0b17123578001082d47ccd8b749293f6.zip | |
fix ftp URL parsing when using user + pass (#49898)
Diffstat (limited to 'perl-install/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_ { |