summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-03 10:51:13 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-03 10:51:13 +0000
commit595af138a9819ed4711369d561c16c042a14a762 (patch)
treeccbb23b4335ec121976d86a014f5030339b4b1c5 /ucb/source
parent0abfa25fe4fdac8a7e056870b92f5dbd25e6c17b (diff)
CWS-TOOLING: integrate CWS cmis01
2009-02-03 20:05:24 +0100 tkr r267341 : #i95301# fixed crash due wrong array length + resolve merge conflicts 2009-01-12 08:35:39 +0100 tkr r266134 : #158978# support unescaped whitespaces in webdav 2009-01-12 08:33:10 +0100 tkr r266133 : #i95307# build error after rebasing fixed 2009-01-07 09:47:09 +0100 tkr r265948 : #159046# Add new path to the wntmsci12 search path 2009-01-05 15:34:19 +0100 tkr r265873 : CWS-TOOLING: rebase CWS cmis01 to trunk@265758 (milestone: DEV300:m38) 2008-12-23 09:38:53 +0100 tkr r265774 : #158537# new property 2008-12-23 09:36:25 +0100 tkr r265773 : #158537# new property 2008-10-29 13:08:30 +0100 mav r262791 : #i94273# let the interaction handler be used for authentication 2008-10-24 15:56:26 +0200 tkr r262649 : #i95310# NTLM support 2008-10-22 18:14:02 +0200 mav r262611 : #i94273# fix the http scenario 2008-10-22 12:41:12 +0200 tkr r262596 : #i95310# NTLM support repaired (new neon version) 2008-10-22 12:38:47 +0200 tkr r262595 : #i95310# NTLM support repaired (new neon version) 2008-10-22 12:38:31 +0200 tkr r262594 : #i95310# NTLM support repaired (new neon version) 2008-10-22 12:29:43 +0200 tkr r262593 : #i95307# Add blacklist support 2008-10-22 12:29:24 +0200 tkr r262592 : #i95307# Add blacklist support 2008-10-22 12:29:07 +0200 tkr r262591 : #i95307# Add blacklist support 2008-10-22 12:28:44 +0200 tkr r262590 : #i95307# Add blacklist support 2008-10-22 12:25:01 +0200 tkr r262589 : #i95307# Add blacklist support 2008-10-22 12:24:28 +0200 tkr r262588 : #i95307# Add blacklist support 2008-10-22 12:22:36 +0200 tkr r262587 : #i95307# Add blacklist support 2008-10-21 12:46:34 +0200 mav r262568 : #i94273# allow to specify the suggested on IO SaveAs directory and filename 2008-10-21 12:44:49 +0200 mav r262566 : #i94273# allow to specify the suggested on IO SaveAs directory and filename
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/ucp/webdav/NeonHeadRequest.cxx6
-rw-r--r--ucb/source/ucp/webdav/NeonPropFindRequest.cxx2
-rw-r--r--ucb/source/ucp/webdav/NeonSession.cxx6
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx1
4 files changed, 8 insertions, 7 deletions
diff --git a/ucb/source/ucp/webdav/NeonHeadRequest.cxx b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
index 3664b22590ec..e81c8e33b24a 100644
--- a/ucb/source/ucp/webdav/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: NeonHeadRequest.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.11 $
*
* This file is part of OpenOffice.org.
*
@@ -66,7 +66,7 @@ void process_headers(ne_request *req,
while ( it != end )
{
- if ( (*it).equalsIgnoreAsciiCase(aHeaderName) )
+ if ( (*it) == aHeaderName )
break;
++it;
@@ -126,7 +126,7 @@ extern "C" void NHR_ResponseHeaderCatcher( void * userdata,
while ( it != end )
{
- if ( (*it).equalsIgnoreAsciiCase(aHeaderName) )
+ if ( (*it) == aHeaderName )
break;
++it;
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 218b499316a2..87e96240e694 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -104,7 +104,7 @@ extern "C" int NPFR_propfind_iter( void* userdata,
{
aValue = aValue.toAsciiLowerCase();
if ( aValue.compareTo(
- RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 )
+ RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
{
thePropertyValue.Value
<<= OUString::createFromAscii( "collection" );
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 7496503edc2d..165824a44c93 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -767,8 +767,10 @@ void NeonSession::Init()
// Note: Calling ne_set_[server|proxy]_auth more than once per
// m_pHttpSession instance sometimes(?) crashes Neon! ( last
// checked: 0.22.0)
- ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
- ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
+ //ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
+ ne_add_server_auth( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
+ //ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
+ ne_add_proxy_auth ( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
}
}
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 5b7866ca9c9b..305d509b4e2c 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -335,7 +335,6 @@ uno::Sequence< beans::Property > Content::getProperties(
// we used a depth of DAVZERO for PROPFIND.
aPropSet.insert( (*props.begin()).properties.begin(),
(*props.begin()).properties.end() );
-
}
catch ( DAVException const & )
{