diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-27 11:03:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-27 11:03:52 +0200 |
| commit | 9228f41209b1a043e4ec29af8c2f71bb5ad7f798 (patch) | |
| tree | e55478894fa5cb5c8df3abb377fa5383546657c1 /ucb/source | |
| parent | c249f93d96ec87b0acbd25ffe087543d6fe9fb14 (diff) | |
Missing davs URL scheme handling
...looks like it was just forgotten in e557f06cb172dfa5ca04d215226b30e8ca4af4aa
"INTEGRATION: CWS tkr10: i84676 neon and gnome-vfs2"?
Change-Id: I1bae95273f43e58425181bbc4667f87a6389e3a9
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index f3b748402408..b815bc1685ac 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -2510,7 +2510,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( @@ -2540,12 +2540,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. |