Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at Thu Jul 28 16:16:04 CEST 2011. -------- --- libzypp/libzypp.changes 2011-07-25 16:34:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2011-07-28 13:20:27.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 28 13:04:10 CEST 2011 - ma@suse.de + +- Evaluate CURLINFO_CONDITION_UNMET on zero sized successful transfers, + if compiled against libcurl-7.19.4 or above. (bnc#692260) +- version 9.9.2 (8) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzypp-9.9.1.tar.bz2 New: ---- libzypp-9.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.n9TYZN/_old 2011-07-28 16:15:49.000000000 +0200 +++ /var/tmp/diff_new_pack.n9TYZN/_new 2011-07-28 16:15:49.000000000 +0200 @@ -23,7 +23,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 9.9.1 +Version: 9.9.2 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-9.9.1.tar.bz2 -> libzypp-9.9.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-9.9.1/VERSION.cmake new/libzypp-9.9.2/VERSION.cmake --- old/libzypp-9.9.1/VERSION.cmake 2011-07-25 16:31:20.000000000 +0200 +++ new/libzypp-9.9.2/VERSION.cmake 2011-07-28 13:17:24.000000000 +0200 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "9") SET(LIBZYPP_COMPATMINOR "8") SET(LIBZYPP_MINOR "9") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # -# LAST RELEASED: 9.9.1 (8) +# LAST RELEASED: 9.9.2 (8) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-9.9.1/package/libzypp.changes new/libzypp-9.9.2/package/libzypp.changes --- old/libzypp-9.9.1/package/libzypp.changes 2011-07-25 16:31:20.000000000 +0200 +++ new/libzypp-9.9.2/package/libzypp.changes 2011-07-28 13:17:24.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 28 13:04:10 CEST 2011 - ma@suse.de + +- Evaluate CURLINFO_CONDITION_UNMET on zero sized successful transfers, + if compiled against libcurl-7.19.4 or above. (bnc#692260) +- version 9.9.2 (8) + +------------------------------------------------------------------- Mon Jul 25 16:20:37 CEST 2011 - ma@suse.de - Always read /proc/mounts when looking for mounted media (bnc#705893) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-9.9.1/zypp/media/MediaCurl.cc new/libzypp-9.9.2/zypp/media/MediaCurl.cc --- old/libzypp-9.9.1/zypp/media/MediaCurl.cc 2011-07-25 16:31:21.000000000 +0200 +++ new/libzypp-9.9.2/zypp/media/MediaCurl.cc 2011-07-28 13:17:25.000000000 +0200 @@ -1363,7 +1363,28 @@ } ret = curl_easy_perform( _curl ); - +#if CURLVERSION_AT_LEAST(7,19,4) + // bnc#692260: If the client sends a request with an If-Modified-Since header + // with a future date for the server, the server may respond 200 sending a + // zero size file. + // curl-7.19.4 introduces CURLINFO_CONDITION_UNMET to check this condition. + if ( ftell(file) == 0 && ret == 0 ) + { + long httpReturnCode = 33; + if ( curl_easy_getinfo( _curl, CURLINFO_RESPONSE_CODE, &httpReturnCode ) == CURLE_OK && httpReturnCode == 200 ) + { + long conditionUnmet = 33; + if ( curl_easy_getinfo( _curl, CURLINFO_CONDITION_UNMET, &conditionUnmet ) == CURLE_OK && conditionUnmet ) + { + WAR << "TIMECONDITION unmet - retry without." << endl; + curl_easy_setopt(_curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_NONE); + curl_easy_setopt(_curl, CURLOPT_TIMEVALUE, 0L); + ret = curl_easy_perform( _curl ); + } + } + } +#endif + if ( curl_easy_setopt( _curl, CURLOPT_PROGRESSDATA, NULL ) != 0 ) { WAR << "Can't unset CURLOPT_PROGRESSDATA: " << _curlError << endl;; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org