You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/01/26 10:58:18 UTC

svn commit: r1654751 - in /subversion/trunk/subversion/libsvn_ra_serf: get_file.c property.c serf.c stat.c

Author: rhuijben
Date: Mon Jan 26 09:58:18 2015
New Revision: 1654751

URL: http://svn.apache.org/r1654751
Log:
The ra_serf's standard propfind handler verifies that the response has http
status 207, so it is not necessary to check for that again after processing
the response (unlike 1.8, where this was necessary).

* subversion/libsvn_ra_serf/get_file.c
  (svn_ra_serf__get_file): Remove unneeded check.

* subversion/libsvn_ra_serf/property.c
  (svn_ra_serf__fetch_node_props): Remove unneeded check.

* subversion/libsvn_ra_serf/serf.c
  (serf__rev_proplist): Remove unneeded check.

* subversion/libsvn_ra_serf/stat.c
  (svn_ra_serf__stat,
   svn_ra_serf__get_dir): Remove unneeded checks.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/get_file.c
    subversion/trunk/subversion/libsvn_ra_serf/property.c
    subversion/trunk/subversion/libsvn_ra_serf/serf.c
    subversion/trunk/subversion/libsvn_ra_serf/stat.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/get_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/get_file.c?rev=1654751&r1=1654750&r2=1654751&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/get_file.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/get_file.c Mon Jan 26 09:58:18 2015
@@ -369,9 +369,6 @@ svn_ra_serf__get_file(svn_ra_session_t *
 
   SVN_ERR(svn_ra_serf__context_run_one(propfind_handler, pool));
 
-  if (propfind_handler->sline.code != 207)
-    return svn_error_trace(svn_ra_serf__unexpected_status(propfind_handler));
-
   /* Verify that resource type is not collection. */
   if (fb.kind != svn_node_file)
     {

Modified: subversion/trunk/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/property.c?rev=1654751&r1=1654750&r2=1654751&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/property.c Mon Jan 26 09:58:18 2015
@@ -577,9 +577,6 @@ svn_ra_serf__fetch_node_props(apr_hash_t
 
   SVN_ERR(svn_ra_serf__context_run_one(handler, scratch_pool));
 
-  if (handler->sline.code != 207)
-    return svn_error_trace(svn_ra_serf__unexpected_status(handler));
-
   *results = props;
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1654751&r1=1654750&r2=1654751&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Mon Jan 26 09:58:18 2015
@@ -901,9 +901,6 @@ serf__rev_proplist(svn_ra_session_t *ra_
 
   SVN_ERR(svn_ra_serf__context_run_one(handler, scratch_pool));
 
-  if (handler->sline.code != 207)
-    return svn_error_trace(svn_ra_serf__unexpected_status(handler));
-
   svn_ra_serf__keep_only_regular_props(props, scratch_pool);
 
   *ret_props = props;

Modified: subversion/trunk/subversion/libsvn_ra_serf/stat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/stat.c?rev=1654751&r1=1654750&r2=1654751&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/stat.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/stat.c Mon Jan 26 09:58:18 2015
@@ -323,8 +323,6 @@ svn_ra_serf__stat(svn_ra_session_t *ra_s
 
   err = svn_ra_serf__context_run_one(handler, pool);
 
-  if (!err && handler->sline.code != 207)
-    err = svn_ra_serf__unexpected_status(handler);
   if (err)
     {
       if (err->apr_err == SVN_ERR_FS_NOT_FOUND)
@@ -347,9 +345,6 @@ svn_ra_serf__stat(svn_ra_session_t *ra_s
 
       /* Run the same handler again */
       SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
-
-      if (handler->sline.code != 207)
-        return svn_error_trace(svn_ra_serf__unexpected_status(handler));
     }
 
   if (deadprop_count != svn_tristate_unknown)
@@ -551,9 +546,6 @@ svn_ra_serf__get_dir(svn_ra_session_t *r
                                             session,
                                             scratch_pool));
 
-      if (dirent_handler->sline.code != 207)
-        return svn_error_trace(svn_ra_serf__unexpected_status(dirent_handler));
-
       if (gdb.supports_deadprop_count == svn_tristate_false
           && session->supports_deadprop_count == svn_tristate_unknown
           && dirent_fields & SVN_DIRENT_HAS_PROPS)
@@ -582,9 +574,6 @@ svn_ra_serf__get_dir(svn_ra_session_t *r
       SVN_ERR(svn_ra_serf__context_run_wait(&props_handler->done,
                                             session,
                                             scratch_pool));
-
-      if (props_handler->sline.code != 207)
-        return svn_error_trace(svn_ra_serf__unexpected_status(props_handler));
     }
 
   /* And dirent again for the case when we had to send the request again */
@@ -593,9 +582,6 @@ svn_ra_serf__get_dir(svn_ra_session_t *r
       SVN_ERR(svn_ra_serf__context_run_wait(&dirent_handler->done,
                                             session,
                                             scratch_pool));
-
-      if (dirent_handler->sline.code != 207)
-        return svn_error_trace(svn_ra_serf__unexpected_status(dirent_handler));
     }
 
   if (gdb.supports_deadprop_count != svn_tristate_unknown)