From 877d9928899d6818c262843f626d2783bd888561 Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Tue, 13 Oct 2009 13:30:56 +0200 Subject: #i105738# - corrected check for system credentials availability logic. --- ucb/source/ucp/webdav/NeonSession.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ucb/source') diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index b455ffebbb9b..ac581fcf7581 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -329,8 +329,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, #ifdef NE_FEATURE_SSPI bCanUseSystemCreds = (attempt == 0) && // avoid endless loops ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature. - ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) || - ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ); + ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) || + ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) ); #endif // #i97003# (tkr): Ask XMasterPasswordHandling if we should store the -- cgit From efdb9a4a4451e7c87888e6921fab5fd626b4ad26 Mon Sep 17 00:00:00 2001 From: Tobias Krause Date: Thu, 12 Nov 2009 06:37:32 +0000 Subject: #i106766# Disable XCommandProcessor::Abort --- ucb/source/ucp/webdav/NeonSession.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ucb/source') diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index b455ffebbb9b..5d1ba2d6927c 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -1319,8 +1319,11 @@ void NeonSession::POST( const rtl::OUString & inPath, void NeonSession::ABORT() throw ( DAVException ) { - if (NULL !=m_pHttpSession) - ne_close_connection(m_pHttpSession); + // 11.11.09 (tkr): The following code lines causing crashes if closing a ongoing connection. It turned out that this existing solution doesn't work in multi-threading environments. + // So I disabled them in 3.2. . Issue #73893# should fix it in OOo 3.3. + + //if (NULL !=m_pHttpSession) + // ne_close_connection(m_pHttpSession); } // ------------------------------------------------------------------- -- cgit From 9ce205f4769bc01cd271ff9b96c9ec2438162bab Mon Sep 17 00:00:00 2001 From: Tobias Krause Date: Tue, 17 Nov 2009 08:00:39 +0000 Subject: #i106766# ::Abort Method disabled --- ucb/source/ucp/webdav/DAVResourceAccess.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ucb/source') diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 67f8e5a386f0..140b3dd3af94 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -555,8 +555,9 @@ void DAVResourceAccess::GET( void DAVResourceAccess::ABORT() throw( DAVException ) { - initialize(); - m_xSession->ABORT(); + // 17.11.09 (tkr): abort currently disabled caused by issue i106766 + // initialize(); + // m_xSession->ABORT(); } //========================================================================= namespace { -- cgit From 9bd1ae5e434619b04b6ed3c3a8973e2e0385fbd6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 19 Nov 2009 20:42:17 +0000 Subject: cmcfixes67: #i107059#: remove warning --- ucb/source/ucp/gio/gio_mount.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ucb/source') diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx index 2756262ce91d..7360304e8328 100644 --- a/ucb/source/ucp/gio/gio_mount.cxx +++ b/ucb/source/ucp/gio/gio_mount.cxx @@ -68,7 +68,7 @@ static void ooo_mount_operation_class_init (OOoMountOperationClass *klass) using namespace com::sun::star; static void ooo_mount_operation_ask_password (GMountOperation *op, - const char *message, const char *default_user, + const char * /*message*/, const char *default_user, const char *default_domain, GAskPasswordFlags flags) { uno::Reference< task::XInteractionHandler > xIH; -- cgit