commit c524ac63dbf245c891482bef7d2723318cf799e5
author Greg Stein <gstein@apache.org> Wed Jul 03 06:41:57 2013 +0000
committer Greg Stein <gstein@apache.org> Wed Jul 03 06:41:57 2013 +0000
tree ddb679f066443a97bf91106a9e6339fe2f63a9f6
parent 1d0d8aa880bbfca59616303738078250095d6002

On the 1.8.x-busted-proxy branch:

[ NOTE: reverted in r1502099 ]

In the spirit of r1496550, shift the BUSTED_PROXY config to a local
symbol within ra_serf.

* subversion/include/svn_config.h:
  (SVN_CONFIG_OPTION_BUSTED_PROXY): removed

* subversion/libsvn_ra_serf/serf.c:
  (OPTION_BUSTED_PROXY): local copy of SVN_CONFIG_OPTION_BUSTED_PROXY
  (load_config): use (new) local symbol


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-busted-proxy@1499225 13f79535-47bb-0310-9956-ffa450edef68

subversion/include/svn_config.h

diff --git a/subversion/include/svn_config.h b/subversion/include/svn_config.h
index eca4764..c5d6976 100644
--- a/subversion/include/svn_config.h
+++ b/subversion/include/svn_config.h
@@ -95,8 +95,6 @@
 #define SVN_CONFIG_OPTION_HTTP_BULK_UPDATES         "http-bulk-updates"
 /** @since New in 1.8. */
 #define SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS      "http-max-connections"
-/** @since New in 1.9. */
-#define SVN_CONFIG_OPTION_BUSTED_PROXY              "busted-proxy"
 
 #define SVN_CONFIG_CATEGORY_CONFIG          "config"
 #define SVN_CONFIG_SECTION_AUTH                 "auth"

subversion/libsvn_ra_serf/serf.c

diff --git a/subversion/libsvn_ra_serf/serf.c b/subversion/libsvn_ra_serf/serf.c
index 7914951..0651b06 100644
--- a/subversion/libsvn_ra_serf/serf.c
+++ b/subversion/libsvn_ra_serf/serf.c
@@ -137,6 +137,10 @@
    runtime configuration variable. */
 #define DEFAULT_HTTP_TIMEOUT 600
 
+/* Private symbol for the 1.9-public SVN_CONFIG_OPTION_BUSTED_PROXY config var.  */
+#define OPTION_BUSTED_PROXY "busted-proxy"
+
+
 static svn_error_t *
 load_config(svn_ra_serf__session_t *session,
             apr_hash_t *config_hash,
@@ -228,7 +232,7 @@
   /* Is this proxy potentially busted? Do we need to take special care?  */
   SVN_ERR(svn_config_get_bool(config, &session->busted_proxy,
                               SVN_CONFIG_SECTION_GLOBAL,
-                              SVN_CONFIG_OPTION_BUSTED_PROXY,
+                              OPTION_BUSTED_PROXY,
                               FALSE));
 
   if (config)
@@ -292,7 +296,7 @@
       SVN_ERR(svn_config_get_bool(
                config, &session->busted_proxy,
                server_group,
-               SVN_CONFIG_OPTION_BUSTED_PROXY,
+               OPTION_BUSTED_PROXY,
                session->busted_proxy));
     }