Attachment #50707 for issue #84676

View | Details | Raw Unified | Return to issue 84676
Collapse All | Expand All

Lines 2600-2605 Link Here

(-)openoffice.org.orig/ucb/source/ucp/webdav/webdavcontent.cxx (+17 lines)
2600	sourceURI.SetScheme(	2600	sourceURI.SetScheme(
2601	rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );	2601	rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
2602	}	2602	}
		2603	else if ( aScheme.equalsAsciiL(
		2604	RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
		2605	{
		2606	sourceURI.SetScheme(
		2607	rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
		2608	}
		2609	else if ( aScheme.equalsAsciiL(
		2610	RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
		2611	{
		2612	sourceURI.SetScheme(
		2613	rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) );
		2614	}
2603	else	2615	else
2604	{	2616	{
2605	if ( !aScheme.equalsAsciiL(	2617	if ( !aScheme.equalsAsciiL(
Lines 2622-2627 Link Here
2622	RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )	2634	RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
2623	targetURI.SetScheme(	2635	targetURI.SetScheme(
2624	rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );	2636	rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
		2637	else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
		2638	RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
		2639	targetURI.SetScheme(
		2640	rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
		2641
2625		2642
2626	// @@@ This implementation of 'transfer' only works	2643	// @@@ This implementation of 'transfer' only works
2627	// if the source and target are located at same host.	2644	// if the source and target are located at same host.

Lines 146-153 Link Here

(-)openoffice.org.orig/ucb/source/ucp/webdav/webdavprovider.cxx (-2 / +23 lines)
146	!aScheme.equalsAsciiL(	146	!aScheme.equalsAsciiL(
147	RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&	147	RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&
148	!aScheme.equalsAsciiL(	148	!aScheme.equalsAsciiL(
149	RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) )	149	RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) &&
150	&&	150	!aScheme.equalsAsciiL(
		151	RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) &&
		152	!aScheme.equalsAsciiL(
		153	RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) &&
151	!aScheme.equalsAsciiL(	154	!aScheme.equalsAsciiL(
152	RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )	155	RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )
153	)	156	)
Lines 177-182 Link Here
177	HTTP_URL_SCHEME ) );	180	HTTP_URL_SCHEME ) );
178	bNewId = true;	181	bNewId = true;
179	}	182	}
		183	else if ( aScheme.equalsAsciiL(
		184	RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
		185	{
		186	aURL = aURL.replaceAt( 0,
		187	DAV_URL_SCHEME_LENGTH,
		188	rtl::OUString::createFromAscii(
		189	HTTP_URL_SCHEME ) );
		190	bNewId = true;
		191	}
		192	else if ( aScheme.equalsAsciiL(
		193	RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
		194	{
		195	aURL = aURL.replaceAt( 0,
		196	DAVS_URL_SCHEME_LENGTH,
		197	rtl::OUString::createFromAscii(
		198	HTTPS_URL_SCHEME ) );
		199	bNewId = true;
		200	}
180		201
181	sal_Int32 nPos = aURL.lastIndexOf( '/' );	202	sal_Int32 nPos = aURL.lastIndexOf( '/' );
182	if ( nPos != aURL.getLength() - 1 )	203	if ( nPos != aURL.getLength() - 1 )

Lines 79-84 Link Here

(-)openoffice.org.orig/ucb/source/ucp/webdav/webdavprovider.hxx (+8 lines)
79	#define HTTPS_URL_SCHEME "https"	79	#define HTTPS_URL_SCHEME "https"
80	#define HTTPS_URL_SCHEME_LENGTH 5	80	#define HTTPS_URL_SCHEME_LENGTH 5
81		81
		82	#define DAV_URL_SCHEME "dav"
		83	#define DAV_URL_SCHEME_LENGTH 3
		84
		85	#define DAVS_URL_SCHEME "davs"
		86	#define DAVS_URL_SCHEME_LENGTH 4
		87
		88
		89
82	#define FTP_URL_SCHEME "ftp"	90	#define FTP_URL_SCHEME "ftp"
83		91
84	#define HTTP_CONTENT_TYPE \	92	#define HTTP_CONTENT_TYPE \

Lines 106-111 Link Here

(-)openoffice.org.orig/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu (+22 lines)
106	<value/>	106	<value/>
107	</prop>	107	</prop>
108	</node>	108	</node>
		109	<node oor:name="Provider7" oor:op="replace">
		110	<prop oor:name="ServiceName">
		111	<value>com.sun.star.ucb.WebDAVContentProvider</value>
		112	</prop>
		113	<prop oor:name="URLTemplate">
		114	<value>dav</value>
		115	</prop>
		116	<prop oor:name="Arguments">
		117	<value/>
		118	</prop>
		119	</node>
109	<node oor:name="Provider8" oor:op="replace">	120	<node oor:name="Provider8" oor:op="replace">
110	<prop oor:name="ServiceName">	121	<prop oor:name="ServiceName">
111	<value>com.sun.star.ucb.PackageContentProvider</value>	122	<value>com.sun.star.ucb.PackageContentProvider</value>
Lines 162-167 Link Here
162	</prop>	173	</prop>
163	</node>	174	</node>
164	</node>	175	</node>
		176	<node oor:name="Provider13" oor:op="replace">
		177	<prop oor:name="ServiceName">
		178	<value>com.sun.star.ucb.WebDAVContentProvider</value>
		179	</prop>
		180	<prop oor:name="URLTemplate">
		181	<value>davs</value>
		182	</prop>
		183	<prop oor:name="Arguments">
		184	<value/>
		185	</prop>
		186	</node>
165	</node>	187	</node>
166	</node>	188	</node>
167	</node>	189	</node>

Lines 256-261 Link Here

(-)openoffice.org.orig/ucb/source/ucp/webdav.orig/NeonSession.cxx (+7 lines)
256	return 0;	256	return 0;
257	}	257	}
258		258
		259	extern "C" int ignore_verify(void , int , const ne_ssl_certificate )
		260	{
		261	return 0;
		262	}
		263
259	// -------------------------------------------------------------------	264	// -------------------------------------------------------------------
260	extern "C" int NeonSession_NeonAuth( void * inUserData,	265	extern "C" int NeonSession_NeonAuth( void * inUserData,
261	const char * inRealm,	266	const char * inRealm,
Lines 621-626 Link Here
621	// checked: 0.22.0)	626	// checked: 0.22.0)
622	ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );	627	ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
623	ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );	628	ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
		629
		630	ne_ssl_set_verify( m_pHttpSession, ignore_verify, this);
624	}	631	}
625	}	632	}
626		633

Return to issue 84676