subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject svn commit: r1502099 - in /subversion/branches/1.8.x-busted-proxy/subversion: include/svn_config.h libsvn_ra_serf/serf.c
Date Thu, 11 Jul 2013 03:51:38 GMT
Author: gstein
Date: Thu Jul 11 03:51:38 2013
New Revision: 1502099

URL: http://svn.apache.org/r1502099
Log:
On the 1.8.x-busted-proxy branch:

Revert r1499225 (restore public CONFIG_OPTION symbol).

Modified:
    subversion/branches/1.8.x-busted-proxy/subversion/include/svn_config.h
    subversion/branches/1.8.x-busted-proxy/subversion/libsvn_ra_serf/serf.c

Modified: subversion/branches/1.8.x-busted-proxy/subversion/include/svn_config.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/include/svn_config.h?rev=1502099&r1=1502098&r2=1502099&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/include/svn_config.h (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/include/svn_config.h Thu Jul 11 03:51:38
2013
@@ -95,6 +95,8 @@ typedef struct svn_config_t svn_config_t
 #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"

Modified: subversion/branches/1.8.x-busted-proxy/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-busted-proxy/subversion/libsvn_ra_serf/serf.c?rev=1502099&r1=1502098&r2=1502099&view=diff
==============================================================================
--- subversion/branches/1.8.x-busted-proxy/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/branches/1.8.x-busted-proxy/subversion/libsvn_ra_serf/serf.c Thu Jul 11 03:51:38
2013
@@ -137,10 +137,6 @@ load_http_auth_types(apr_pool_t *pool, s
    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,
@@ -232,7 +228,7 @@ load_config(svn_ra_serf__session_t *sess
   /* 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,
-                              OPTION_BUSTED_PROXY,
+                              SVN_CONFIG_OPTION_BUSTED_PROXY,
                               FALSE));
 
   if (config)
@@ -296,7 +292,7 @@ load_config(svn_ra_serf__session_t *sess
       SVN_ERR(svn_config_get_bool(
                config, &session->busted_proxy,
                server_group,
-               OPTION_BUSTED_PROXY,
+               SVN_CONFIG_OPTION_BUSTED_PROXY,
                session->busted_proxy));
     }
 



Mime
View raw message