diff options
| author | Tobias Krause <tkr@openoffice.org> | 2010-01-25 12:39:18 +0100 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2010-01-25 12:39:18 +0100 |
| commit | f8037b9dc3b5d00ac8c99b7a1512b9691b05935d (patch) | |
| tree | 7381d609a9ba5c6eebbbd3197ca1f9d30ec9190c /ucb/source | |
| parent | e9f7eaf63498eb1f08e79ffd879b4dabfd86675d (diff) | |
| parent | 3b3e144c13a85b21b32904f245f44256c63e10e5 (diff) | |
tkr32: rebase from m65 to m70
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/ucp/gio/gio_mount.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/DAVResourceAccess.cxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/NeonSession.cxx | 11 |
3 files changed, 11 insertions, 7 deletions
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; 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 { diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index b455ffebbb9b..25126f619540 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 @@ -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); } // ------------------------------------------------------------------- |