diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-27 11:08:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-27 11:08:28 +0200 |
| commit | 9c3f5324bf155b11dad2036a3556c8afafdb89a9 (patch) | |
| tree | e391076d8af0554fe3927af2d9f9f3dc48816d8c /ucb | |
| parent | 9228f41209b1a043e4ec29af8c2f71bb5ad7f798 (diff) | |
Apply webdav-neon/ fix to webdav/, too
cf. 9228f41209b1a043e4ec29af8c2f71bb5ad7f798 "Missing davs URL scheme handling"
Change-Id: Ia161691cc213b5b2c1a3a589ce05b6ad8558013c
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/webdav/webdavcontent.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
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. |