svn commit: r1144396 - in /subversion/trunk/subversion: libsvn_ra_neon/options.c libsvn_ra_serf/options.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Jul  8 17:35:24 2011
New Revision: 1144396

URL: http://svn.apache.org/viewvc?rev=1144396&view=rev
Log:
Change a comment about removing code into a comment documenting the
behaviour, because the consensus is to leave the code as it is.

* subversion/libsvn_ra_neon/options.c
  (SVN_IGNORE_V2_ENV_VAR): Add a doc string here.
  (parse_capabilities): Remove the '###' comment from here. Correct the
    indentation.

* subversion/libsvn_ra_serf/options.c
  (SVN_IGNORE_V2_ENV_VAR): Add a doc string here.
  (capabilities_headers_iterator_callback): Remove the '###' comment from
    here.

Modified:
    subversion/trunk/subversion/libsvn_ra_neon/options.c
    subversion/trunk/subversion/libsvn_ra_serf/options.c

Modified: subversion/trunk/subversion/libsvn_ra_neon/options.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/options.c?rev=1144396&r1=1144395&r2=1144396&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/options.c Fri Jul  8 17:35:24 2011
@@ -34,6 +34,8 @@
 #include "ra_neon.h"
 
 
+/* In a debug build, setting this environment variable to "yes" will force
+   the client to speak v1, even if the server is capable of speaking v2. */
 #define SVN_IGNORE_V2_ENV_VAR "SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2"
 
 static const svn_ra_neon__xml_elm_t options_elements[] =
@@ -242,17 +244,13 @@ parse_capabilities(ne_request *req,
   if ((val = ne_get_response_header(req, SVN_DAV_ME_RESOURCE_HEADER)))
     {
 #ifdef SVN_DEBUG
-      /* ### This section is throw in here for development use.  It
-         ### allows devs the chance to force the client to speak v1,
-         ### even if the server is capable of speaking v2.  We should
-         ### probably remove it before 1.7 goes final. */
       char *ignore_v2_env_var = getenv(SVN_IGNORE_V2_ENV_VAR);
 
       if (! (ignore_v2_env_var
              && apr_strnatcasecmp(ignore_v2_env_var, "yes") == 0))
         ras->me_resource = apr_pstrdup(ras->pool, val);
 #else
-        ras->me_resource = apr_pstrdup(ras->pool, val);
+      ras->me_resource = apr_pstrdup(ras->pool, val);
 #endif
     }
   if ((val = ne_get_response_header(req, SVN_DAV_REV_ROOT_STUB_HEADER)))

Modified: subversion/trunk/subversion/libsvn_ra_serf/options.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/options.c?rev=1144396&r1=1144395&r2=1144396&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/options.c Fri Jul  8 17:35:24 2011
@@ -39,6 +39,9 @@
 
 #include "ra_serf.h"
 
+
+/* In a debug build, setting this environment variable to "yes" will force
+   the client to speak v1, even if the server is capable of speaking v2. */
 #define SVN_IGNORE_V2_ENV_VAR "SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2"
 
 
@@ -349,10 +352,6 @@ capabilities_headers_iterator_callback(v
       else if (svn_cstring_casecmp(key, SVN_DAV_ME_RESOURCE_HEADER) == 0)
         {
 #ifdef SVN_DEBUG
-          /* ### This section is throw in here for development use.  It
-             ### allows devs the chance to force the client to speak v1,
-             ### even if the server is capable of speaking v2.  We should
-             ### probably remove it before 1.7 goes final. */
           char *ignore_v2_env_var = getenv(SVN_IGNORE_V2_ENV_VAR);
 
           if (!(ignore_v2_env_var