Re: svn commit: r29426 - trunk/subversion/libsvn_ra_neon

On Feb 19, 2008 4:17 AM, <joe_at_tigris.org> wrote:
> Author: joe
> Date: Tue Feb 19 04:17:31 2008
> New Revision: 29426
>
> Log:
> * subversion/libsvn_ra_neon/session.c
> (get_server_settings): Apply http-proxy-exceptions only to
> proxy-specific config options; use non-proxy-specific global
> defaults regardless of the exceptions setting.
>
>
> Modified:
> trunk/subversion/libsvn_ra_neon/session.c
>
> Modified: trunk/subversion/libsvn_ra_neon/session.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_ra_neon/session.c?pathrev=29426&r1=29425&r2=29426
> ==============================================================================
> --- trunk/subversion/libsvn_ra_neon/session.c (original)
> +++ trunk/subversion/libsvn_ra_neon/session.c Tue Feb 19 04:17:31 2008
> @@ -452,8 +452,8 @@
> http_auth_types = NULL;
> *pk11_provider = NULL;
>
> - /* If there are defaults, use them, but only if the requested host
> - is not one of the exceptions to the defaults. */
> + /* Use the default proxy-specific settings if and only if
> + "http-proxy-expections" is not set to exclude this host. */

"expections"

> svn_config_get(cfg, &exceptions, SVN_CONFIG_SECTION_GLOBAL,
> SVN_CONFIG_OPTION_HTTP_PROXY_EXCEPTIONS, NULL);
> if (exceptions)
> @@ -471,19 +471,21 @@
> SVN_CONFIG_OPTION_HTTP_PROXY_USERNAME, NULL);
> svn_config_get(cfg, proxy_password, SVN_CONFIG_SECTION_GLOBAL,
> SVN_CONFIG_OPTION_HTTP_PROXY_PASSWORD, NULL);
> - svn_config_get(cfg, &timeout_str, SVN_CONFIG_SECTION_GLOBAL,
> - SVN_CONFIG_OPTION_HTTP_TIMEOUT, NULL);
> - SVN_ERR(svn_config_get_bool(cfg, compression, SVN_CONFIG_SECTION_GLOBAL,
> - SVN_CONFIG_OPTION_HTTP_COMPRESSION, TRUE));
> - svn_config_get(cfg, &debug_str, SVN_CONFIG_SECTION_GLOBAL,
> - SVN_CONFIG_OPTION_NEON_DEBUG_MASK, NULL);
> + }
> +
> + /* Apply non-proxy-specific settings regardless of exceptions: */
> + svn_config_get(cfg, &timeout_str, SVN_CONFIG_SECTION_GLOBAL,
> + SVN_CONFIG_OPTION_HTTP_TIMEOUT, NULL);
> + SVN_ERR(svn_config_get_bool(cfg, compression, SVN_CONFIG_SECTION_GLOBAL,
> + SVN_CONFIG_OPTION_HTTP_COMPRESSION, TRUE));
> + svn_config_get(cfg, &debug_str, SVN_CONFIG_SECTION_GLOBAL,
> + SVN_CONFIG_OPTION_NEON_DEBUG_MASK, NULL);
> #ifdef SVN_NEON_0_26
> - svn_config_get(cfg, &http_auth_types, SVN_CONFIG_SECTION_GLOBAL,
> - SVN_CONFIG_OPTION_HTTP_AUTH_TYPES, NULL);
> + svn_config_get(cfg, &http_auth_types, SVN_CONFIG_SECTION_GLOBAL,
> + SVN_CONFIG_OPTION_HTTP_AUTH_TYPES, NULL);
> #endif
> - svn_config_get(cfg, pk11_provider, SVN_CONFIG_SECTION_GLOBAL,
> - SVN_CONFIG_OPTION_SSL_PKCS11_PROVIDER, NULL);
> - }
> + svn_config_get(cfg, pk11_provider, SVN_CONFIG_SECTION_GLOBAL,
> + SVN_CONFIG_OPTION_SSL_PKCS11_PROVIDER, NULL);
>
> if (cfg)
> server_group = svn_config_find_group(cfg, requested_host,
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org