From 9c3f5324bf155b11dad2036a3556c8afafdb89a9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Aug 2015 11:08:28 +0200 Subject: Apply webdav-neon/ fix to webdav/, too cf. 9228f41209b1a043e4ec29af8c2f71bb5ad7f798 "Missing davs URL scheme handling" Change-Id: Ia161691cc213b5b2c1a3a589ce05b6ad8558013c --- ucb/source/ucp/webdav/webdavcontent.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'ucb') diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 3173f2655845..cf370b7f73c0 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -2661,7 +2661,7 @@ void Content::transfer( // Check source's and target's URL scheme - const OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); + OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); if ( aScheme == WEBDAV_URL_SCHEME ) { sourceURI.SetScheme( @@ -2691,12 +2691,16 @@ void Content::transfer( } } - if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME ) + aScheme = targetURI.GetScheme().toAsciiLowerCase(); + if ( aScheme == WEBDAV_URL_SCHEME ) targetURI.SetScheme( OUString( HTTP_URL_SCHEME ) ); - else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME ) + else if ( aScheme == DAV_URL_SCHEME ) targetURI.SetScheme( OUString( HTTP_URL_SCHEME ) ); + else if ( aScheme == DAVS_URL_SCHEME ) + targetURI.SetScheme( + OUString( HTTPS_URL_SCHEME ) ); // @@@ This implementation of 'transfer' only works // if the source and target are located at same host. -- cgit