You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2013/07/03 08:41:57 UTC
svn commit: r1499225 - in
/subversion/branches/1.8.x-busted-proxy/subversion: include/svn_config.h
libsvn_ra_serf/serf.c
Author: gstein
Date: Wed Jul 3 06:41:57 2013
New Revision: 1499225
URL: http://svn.apache.org/r1499225
Log:
On the 1.8.x-busted-proxy branch:
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
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=1499225&r1=1499224&r2=1499225&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 Wed Jul 3 06:41:57 2013
@@ -95,8 +95,6 @@ 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=1499225&r1=1499224&r2=1499225&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 Wed Jul 3 06:41:57 2013
@@ -137,6 +137,10 @@ 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,
@@ -228,7 +232,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,
- SVN_CONFIG_OPTION_BUSTED_PROXY,
+ OPTION_BUSTED_PROXY,
FALSE));
if (config)
@@ -292,7 +296,7 @@ load_config(svn_ra_serf__session_t *sess
SVN_ERR(svn_config_get_bool(
config, &session->busted_proxy,
server_group,
- SVN_CONFIG_OPTION_BUSTED_PROXY,
+ OPTION_BUSTED_PROXY,
session->busted_proxy));
}