Imported Upstream version 15.0.0

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

diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc
index 150856a..871395c 100644 (file)
--- a/zypp/media/MediaCurl.cc
+++ b/zypp/media/MediaCurl.cc
@@ -295,14 +295,6 @@ void fillSettingsFromUrl( const Url &url, TransferSettings &s )
         else
             s.setClientCertificatePath(client_cert);
     }
-    Pathname client_key( url.getQueryParam("ssl_clientkey") );
-    if( ! client_key.empty())
-    {
-        if( !PathInfo(client_key).isFile() || !client_key.absolute())
-            ZYPP_THROW(MediaBadUrlException(url, "Invalid ssl_clientkey file"));
-        else
-            s.setClientKeyPath(client_key);
-    }
 
     param = url.getQueryParam( "proxy" );
     if ( ! param.empty() )
@@ -578,12 +570,9 @@ void MediaCurl::setupEasy()
   // so that we don't add headers twice
   TransferSettings vol_settings(_settings);
 
-  // add custom headers for download.opensuse.org (bsc#955801)
-  if ( _url.getHost() == "download.opensuse.org" )
-  {
-    vol_settings.addHeader(anonymousIdHeader());
-    vol_settings.addHeader(distributionFlavorHeader());
-  }
+  // add custom headers
+  vol_settings.addHeader(anonymousIdHeader());
+  vol_settings.addHeader(distributionFlavorHeader());
   vol_settings.addHeader("Pragma:");
 
   _settings.setTimeout(ZConfig::instance().download_transfer_timeout());
@@ -643,10 +632,6 @@ void MediaCurl::setupEasy()
     {
       SET_OPTION(CURLOPT_SSLCERT, _settings.clientCertificatePath().c_str());
     }
-    if( ! _settings.clientKeyPath().empty() )
-    {
-      SET_OPTION(CURLOPT_SSLKEY, _settings.clientKeyPath().c_str());
-    }
 
 #ifdef CURLSSLOPT_ALLOW_BEAST
     // see bnc#779177
@@ -1063,7 +1048,7 @@ void MediaCurl::evaluateCurlCode( const Pathname &filename,
         break;
       case CURLE_SSL_PEER_CERTIFICATE:
       default:
-        err = "Curl error " + str::numstring( code );
+        err = "Unrecognized error";
         break;
       }