diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-01-02 16:03:20 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-05 11:39:34 +0000 |
| commit | 5c4de8f1991f1a9964e661717dc6b46f6a6a3608 (patch) | |
| tree | 3feb1a9072b79f1abc069037bdb10f8f64815eb2 | |
| parent | 95c125f012073ab9115b79eccce09696a845be36 (diff) | |
Related tdf#96833: breadcrumb: setting URL, host port gets lost.
At the same time added a log in WebDAV, useful to discover the
issue.
Change-Id: I3435f8d3da28f7d6b4c2e154cf2bb5ee33a9a690
Reviewed-on: https://gerrit.libreoffice.org/21047
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | svtools/source/control/breadcrumb.cxx | 11 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx index 2f7766ec3e9b..b611a42e5c52 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/svtools/source/control/breadcrumb.cxx @@ -105,13 +105,22 @@ void Breadcrumb::SetURL( const OUString& rURL ) m_aCurrentURL = rURL; INetURLObject aURL( rURL ); aURL.setFinalSlash(); + //prepare the Host port + OUString sHostPort; + + if( aURL.HasPort() ) + { + sHostPort += ":"; + sHostPort += sHostPort.number( aURL.GetPort() ); + } OUString sUser = aURL.GetUser( INetURLObject::NO_DECODE ); OUString sPath = aURL.GetURLPath(INetURLObject::DECODE_WITH_CHARSET); OUString sRootPath = INetURLObject::GetScheme( aURL.GetProtocol() ) + sUser + ( sUser.isEmpty() ? OUString() : "@" ) - + aURL.GetHost(); + + aURL.GetHost() + + sHostPort; int nSegments = aURL.getSegmentCount(); unsigned int nPos = 0; diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 41f956370952..23f14405396d 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -1746,6 +1746,7 @@ void NeonSession::HandleError( int nError, m_aProxyName, m_nProxyPort ) ); case NE_CONNECT: // Could not connect to server + SAL_WARN( "ucb.ucp.webdav", "DAVException::DAV_HTTP_CONNECT" ); throw DAVException( DAVException::DAV_HTTP_CONNECT, NeonUri::makeConnectionEndPointString( m_aHostName, m_nPort ) ); |