svn commit: r1557688 - in /subversion/trunk/subversion/libsvn_ra_serf: blame.c getdate.c

[rh...@apache.org]

Author: rhuijben
Date: Mon Jan 13 12:29:37 2014
New Revision: 1557688

URL: http://svn.apache.org/r1557688
Log:
* subversion/libsvn_ra_serf/blame.c
  (svn_ra_serf__get_file_revs): Expect 200 status.

* subversion/libsvn_ra_serf/getdate.c
  (date_closed): Verify number format.
  (svn_ra_serf__get_dated_revision): Expect 200 status. Replace assertion
    with proper error.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/blame.c
    subversion/trunk/subversion/libsvn_ra_serf/getdate.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/blame.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/blame.c?rev=1557688&r1=1557687&r2=1557688&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/blame.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/blame.c Mon Jan 13 12:29:37 2014
@@ -370,8 +370,8 @@ svn_ra_serf__get_file_revs(svn_ra_sessio
 
   SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
 
-  return svn_error_trace(
-            svn_ra_serf__error_on_status(handler->sline,
-                                         handler->path,
-                                         handler->location));
+  if (handler->sline.code != 200)
+    return svn_error_trace(svn_ra_serf__unexpected_status(handler));
+
+  return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/libsvn_ra_serf/getdate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getdate.c?rev=1557688&r1=1557687&r2=1557688&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getdate.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getdate.c Mon Jan 13 12:29:37 2014
@@ -82,11 +82,14 @@ date_closed(svn_ra_serf__xml_estate_t *x
             apr_pool_t *scratch_pool)
 {
   date_context_t *date_ctx = baton;
+  apr_int64_t rev;
 
   SVN_ERR_ASSERT(leaving_state == VERSION_NAME);
   SVN_ERR_ASSERT(cdata != NULL);
 
-  *date_ctx->revision = SVN_STR_TO_REV(cdata->data);
+  SVN_ERR(svn_cstring_atoi64(&rev, cdata->data));
+
+  *date_ctx->revision = (svn_revnum_t)rev;
 
   return SVN_NO_ERROR;
 }
@@ -157,11 +160,13 @@ svn_ra_serf__get_dated_revision(svn_ra_s
 
   SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
 
-  SVN_ERR(svn_ra_serf__error_on_status(handler->sline,
-                                       report_target,
-                                       handler->location));
+  if (handler->sline.code != 200)
+    return svn_error_trace(svn_ra_serf__unexpected_status(handler));
 
-  SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(*revision));
+  if (!SVN_IS_VALID_REVNUM(*revision))
+    return svn_error_create(SVN_ERR_RA_DAV_PROPS_NOT_FOUND, NULL,
+                            _("The REPORT response did not include "
+                              "the requested properties"));
 
   return SVN_NO_ERROR;
 }