Author: rhuijben
Date: Fri Mar 13 09:11:28 2015
New Revision: 1666379
URL: http://svn.apache.org/r1666379
Log:
Following up on r1666096, introduce new error code for http status 405.
* subversion/include/svn_error_codes.h
(SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED): New error code.
(SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED,
SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED): Deprecate errors that haven't been
used since serf 1.0.
* subversion/libsvn_ra_serf/util.c
(svn_ra_serf__error_on_status,
svn_ra_serf__unexpected_status): Use new error code.
Modified:
subversion/trunk/subversion/include/svn_error_codes.h
subversion/trunk/subversion/libsvn_ra_serf/util.c
Modified: subversion/trunk/subversion/include/svn_error_codes.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_error_codes.h?rev=1666379&r1=1666378&r2=1666379&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_error_codes.h (original)
+++ subversion/trunk/subversion/include/svn_error_codes.h Fri Mar 13 09:11:28
2015
@@ -1066,6 +1066,11 @@ SVN_ERROR_START
SVN_ERR_RA_DAV_CATEGORY_START + 14,
"The server state conflicts with the requested preconditions")
+ /** @since New in 1.9 */
+ SVN_ERRDEF(SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED,
+ SVN_ERR_RA_DAV_CATEGORY_START + 15,
+ "The URL doesn't allow the requested method")
+
/* ra_local errors */
SVN_ERRDEF(SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND,
@@ -1590,11 +1595,14 @@ SVN_ERROR_START
"Diff data source modified unexpectedly")
/* libsvn_ra_serf errors */
- /** @since New in 1.5. */
+ /** @since New in 1.5.
+ @deprecated SSPI now handled by serf rather than libsvn_ra_serf. */
SVN_ERRDEF(SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED,
SVN_ERR_RA_SERF_CATEGORY_START + 0,
"Initialization of SSPI library failed")
- /** @since New in 1.5. */
+ /** @since New in 1.5.
+ @deprecated Certificate verification now handled by serf rather
+ than libsvn_ra_serf. */
SVN_ERRDEF(SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED,
SVN_ERR_RA_SERF_CATEGORY_START + 1,
"Server SSL certificate untrusted")
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1666379&r1=1666378&r2=1666379&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Fri Mar 13 09:11:28 2015
@@ -1793,8 +1793,8 @@ svn_ra_serf__error_on_status(serf_status
return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
_("'%s' path not found"), path);
case 405:
- return svn_error_createf(SVN_ERR_RA_NOT_IMPLEMENTED, NULL,
- _("HTTP method is not supported on '%s'"),
+ return svn_error_createf(SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED, NULL,
+ _("HTTP method is not allowed on '%s'"),
path);
case 409:
return svn_error_createf(SVN_ERR_FS_CONFLICT, NULL,
@@ -1851,8 +1851,8 @@ svn_ra_serf__unexpected_status(svn_ra_se
handler->path);
case 405:
- return svn_error_createf(SVN_ERR_RA_NOT_IMPLEMENTED, NULL,
- _("HTTP method '%s' is not supported"
+ return svn_error_createf(SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED, NULL,
+ _("The HTTP method '%s' is not allowed"
" on '%s'"),
handler->method, handler->path);
default:
