svn commit: r1807156 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[stefan2]

Author: stefan2
Date: Sun Sep  3 17:28:53 2017
New Revision: 1807156

URL: http://svn.apache.org/viewvc?rev=1807156&view=rev
Log:
Follow-up on r1807154:

* subversion/libsvn_client/conflicts.c
  (ignore_authz_failures): Turns out, mod_dav uses its own error codes
                           for authz failures.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1807156&r1=1807155&r2=1807156&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Sep  3 17:28:53 
2017
@@ -9719,7 +9719,8 @@ static svn_error_t *
 ignore_authz_failures(svn_error_t *err)
 {
   if (err && (   (err->apr_err == SVN_ERR_AUTHZ_UNREADABLE)
-              || (err->apr_err == SVN_ERR_RA_NOT_AUTHORIZED)))
+              || (err->apr_err == SVN_ERR_RA_NOT_AUTHORIZED)
+              || (err->apr_err == SVN_ERR_RA_DAV_FORBIDDEN)))
     {
       svn_error_clear(err);
       err = SVN_NO_ERROR;