Author: pescetti
Date: Wed Oct 7 00:05:49 2015
New Revision: 1707173
URL: http://svn.apache.org/viewvc?rev=1707173&view=rev
Log:
#i126305# Fix access to standard websites (e.g., no WebDAV).
Patch by: Giuseppe Castagno
Modified:
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 7 00:05:49 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main:1417739-1541842
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1650314,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,1700078,1700135,1702894,170289
8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1707167,1707169
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1650314,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,1700078,1700135,1702894,170289
8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1707167,1707169-1707170
Modified:
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx?rev=1707173&r1=1707172&r2=1707173&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx
(original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx Wed
Oct 7 00:05:49 2015
@@ -3091,17 +3091,15 @@ void Content::lock(
aOwner ));
}
break;
+ case SC_FORBIDDEN:
+ case SC_NOT_IMPLEMENTED:
case SC_METHOD_NOT_ALLOWED:
// this it's not always received, but the RFC4918 (which supersed
RFC2518)
// tells about this in:
// http://tools.ietf.org/html/rfc4918#appendix-D.1
// throw exception, will be interpreted by the lock requester
(framework)
// it is actually a info, not an error
- throw ucb::InteractiveLockingLockNotAvailableException(
e.getData(),
-
static_cast< cppu::OWeakObject * >( this ),
-
task::InteractionClassification_INFO,
- aURL,
-
e.getExtendedError() );
+ return;
break;
//i126305 TODO
//see http://tools.ietf.org/html/rfc4918#section-9.10.6
@@ -3579,12 +3577,18 @@ const Content::ResourceType & Content::g
catch ( DAVException const & e )
{
rResAccess->resetUri();
-
- if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
+ switch( e.getStatus() )
{
+ // returned errors are part of base http 1.1 RFCs:
+ case SC_FORBIDDEN: //
https://tools.ietf.org/html/rfc7231#section-6.5.3
+ case SC_NOT_IMPLEMENTED: //
http://tools.ietf.org/html/rfc7231#section-6.6.2
+ case SC_METHOD_NOT_ALLOWED: //
http://tools.ietf.org/html/rfc7231#section-6.5.5
// Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
// resource is NON_DAV
eResourceType = NON_DAV;
+ break;
+ default:
+ ;
}
// cancel command execution is case that no user authentication
data has been provided.
if ( e.getError() == DAVException::DAV_HTTP_NOAUTH )
