Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / media / MediaMultiCurl.cc

diff --git a/zypp/media/MediaMultiCurl.cc b/zypp/media/MediaMultiCurl.cc
index 8b2c83b..9f2f072 100644 (file)
--- a/zypp/media/MediaMultiCurl.cc
+++ b/zypp/media/MediaMultiCurl.cc
@@ -1476,22 +1476,6 @@ void MediaMultiCurl::doGetFileCopy( const Pathname & filename , const Pathname &
   DBG << "done: " << PathInfo(dest) << endl;
 }
 
-///////////////////////////////////////////////////////////////////
-namespace {
-  // bsc#933839: propagate proxy settings passed in the repo URL
-  inline Url propagateQueryParams( Url url_r, const Url & template_r )
-  {
-    for ( std::string param : { "proxy", "proxyport", "proxyuser", "proxypass"} )
-    {
-      const std::string & value( template_r.getQueryParam( param ) );
-      if ( ! value.empty() )
-       url_r.setQueryParam( param, value );
-    }
-    return url_r;
-  }
-}
-///////////////////////////////////////////////////////////////////
-
 void MediaMultiCurl::multifetch(const Pathname & filename, FILE *fp, std::vector<Url> *urllist, callback::SendReport<DownloadProgressReport> *report, MediaBlockList *blklist, off_t filesize) const
 {
   Url baseurl(getFileUrl(filename));
@@ -1530,7 +1514,7 @@ void MediaMultiCurl::multifetch(const Pathname & filename, FILE *fp, std::vector
          if (scheme == "http" || scheme == "https" || scheme == "ftp" || scheme == "tftp")
            {
              checkProtocol(*urliter);
-             myurllist.push_back(propagateQueryParams(*urliter, _url));
+             myurllist.push_back(*urliter);
            }
        }
       catch (...)