download.lst | 4 ++-- ucb/qa/cppunit/webdav/webdav_local_neon.cxx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 573df3d22abc47ac8ceb3bfe2401d82d6aec5f5d Author: Stephan Bergmann <[email protected]> AuthorDate: Mon Jul 31 21:34:49 2023 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Aug 1 16:48:55 2023 +0200 Update to curl-8.2.1.tar.xz ...obtained from <https://curl.se/download/curl-8.2.1.tar.xz> Change-Id: I7260f79e2f72501869ff58c77f0d9dfa3ebdece1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155116 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155132 diff --git a/download.lst b/download.lst index cd4f75c9d2e4..1bb3767bcbe8 100644 --- a/download.lst +++ b/download.lst @@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -CURL_SHA256SUM := 31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6 -CURL_TARBALL := curl-8.1.2.tar.xz +CURL_SHA256SUM := dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894 +CURL_TARBALL := curl-8.2.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit aa02fba0a0de468002f115932277fb890e95ecc8 Author: Stephan Bergmann <[email protected]> AuthorDate: Mon Jul 31 17:09:32 2023 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Aug 1 16:48:49 2023 +0200 Adapt test code to cURL 8.2.0 ...for which CppunitTest_ucb_webdav_core would fail with > ucb/qa/cppunit/webdav/webdav_local_neon.cxx:60:(anonymous namespace)::webdav_local_test::WebdavUriTest > equality assertion failed > - Expected: ?query#fragment > - Actual : /?query#fragment and > ucb/qa/cppunit/webdav/webdav_local_neon.cxx:89:(anonymous namespace)::webdav_local_test::WebdavUriTest2 > equality assertion failed > - Expected: ?query > - Actual : /?query because of <https://github.com/bch/curl/commit/5752e71080cb3aafa8b24c3261419345b832bc92> "urlapi: have *set(PATH) prepend a slash if one is missing". All that test code had been added with b03e070420606d407df2ec5e9dfa7043ecc46177 "ucb: webdav-curl: fix CurlUri::CloneWithRelativeRefPathAbsolute()", and it looks harmless for our use cases that cURL started to behave differently there now. So instead of accepting either of the outcomes depending on what cURL version is being used, just change the test code to not leave out the path-absolute in the calls to CloneWithRelativeRefPathAbsolute (which is documented in ucb/source/ucp/webdav-curl/CurlUri.hxx to take > /// @param matches: relative-ref = path-absolute [ "?" query ] [ "#" fragment ] and path-absolute cannot be empty as per RFC 3986 "Uniform Resource Identifier (URI): Generic Syntax"). Change-Id: If07a28598dfa047ebe89d8bcda19e8fcaa36aed0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155099 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155150 diff --git a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx index bde7652b9ffa..a457bc6d2b28 100644 --- a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx +++ b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx @@ -52,12 +52,12 @@ namespace CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() ); CPPUNIT_ASSERT_EQUAL( OUString("http://user%[email protected]:8040/foo/bar";), uri2.GetURI() ); - CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query#fragment")); + CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query#fragment")); CPPUNIT_ASSERT_EQUAL( OUString("http"), uri3.GetScheme() ); CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() ); CPPUNIT_ASSERT_EQUAL( OUString("user%40anothername"), uri3.GetUser() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() ); - CPPUNIT_ASSERT_EQUAL( OUString("?query#fragment"), uri3.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( OUString("/?query#fragment"), uri3.GetRelativeReference() ); CPPUNIT_ASSERT_EQUAL( OUString("http://user%[email protected]:8040/?query#fragment";), uri3.GetURI() ); } @@ -80,13 +80,13 @@ namespace CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() ); CPPUNIT_ASSERT_EQUAL( OUString("https://foo:[email protected]:8040/foo/bar";), uri2.GetURI() ); - CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query")); + CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query")); CPPUNIT_ASSERT_EQUAL( OUString("https"), uri3.GetScheme() ); CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() ); CPPUNIT_ASSERT_EQUAL( OUString("foo"), uri3.GetUser() ); CPPUNIT_ASSERT_EQUAL( OUString("bar"), uri3.GetPassword() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() ); - CPPUNIT_ASSERT_EQUAL( OUString("?query"), uri3.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( OUString("/?query"), uri3.GetRelativeReference() ); CPPUNIT_ASSERT_EQUAL( OUString("https://foo:[email protected]:8040/?query";), uri3.GetURI() ); }
