Imported Upstream version 14.42.4

Change-Id: I0f6ba0a5cbbc16e753bf3fe21c1d1525d003f9a0
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 901f1c2..379e863 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
 SET(LIBZYPP_MINOR "42")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_PATCH "4")
 #
-# LAST RELEASED: 14.42.3 (39)
+# LAST RELEASED: 14.42.4 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index e8a2384..b36c548 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Mar  1 12:33:36 CET 2016 - ma@suse.de
+
+- media: Send stats header to download.opensuse.org only (bsc#955801)
+- version 14.42.4 (39)
+
+-------------------------------------------------------------------
 Fri Oct 23 17:15:37 CEST 2015 - ma@suse.de
 
 - Fix broken product: <-> -release package relation (bnc#951782)

diff --git a/zypp/Product.cc b/zypp/Product.cc
index d66d6c3..f195add 100644 (file)
--- a/zypp/Product.cc
+++ b/zypp/Product.cc
@@ -91,7 +91,7 @@ namespace zypp
     {
       if ( it->repository() == repository() && it->arch() == arch() )
       {
-       bool fitsBuildtime = ( it->buildtime() == buildtime() );
+       bool fitsBuildtime = ( PoolItem(*it)->buildtime() == buildtime() );
        if ( found )
        {
          bool lowerEdition = ( it->edition() <= found.edition() );

diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc
index 7ed3f50..486b7bc 100644 (file)
--- a/zypp/media/MediaCurl.cc
+++ b/zypp/media/MediaCurl.cc
@@ -578,9 +578,12 @@ void MediaCurl::setupEasy()
   // so that we don't add headers twice
   TransferSettings vol_settings(_settings);
 
-  // add custom headers
-  vol_settings.addHeader(anonymousIdHeader());
-  vol_settings.addHeader(distributionFlavorHeader());
+  // add custom headers for download.opensuse.org (bsc#955801)
+  if ( _url.getHost() == "download.opensuse.org" )
+  {
+    vol_settings.addHeader(anonymousIdHeader());
+    vol_settings.addHeader(distributionFlavorHeader());
+  }
   vol_settings.addHeader("Pragma:");
 
   _settings.setTimeout(ZConfig::instance().download_transfer_timeout());