You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/07/10 22:17:05 UTC
svn commit: r1501955 - in
/subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf:
ra_serf.h serf.c
Author: danielsh
Date: Wed Jul 10 20:17:05 2013
New Revision: 1501955
URL: http://svn.apache.org/r1501955
Log:
On the tristate-chunked-request branch:
Reduce visibility of an intermediate variable.
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__session_t.using_chunked_requests): Remove this member.
* subversion/libsvn_ra_serf/serf.c
(load_config): Add using_chunked_requests parameter and use it in place of
the removed member.
(svn_ra_serf__open): Track signature change.
Modified:
subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/serf.c
Modified: subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/ra_serf.h?rev=1501955&r1=1501954&r2=1501955&view=diff
==============================================================================
--- subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/ra_serf.h Wed Jul 10 20:17:05 2013
@@ -191,9 +191,6 @@ struct svn_ra_serf__session_t {
/* Are we using a proxy? */
svn_boolean_t using_proxy;
- /* Should we use Transfer-Encoding: chunked for HTTP/1.1 servers. */
- svn_tristate_t using_chunked_requests;
-
const char *proxy_username;
const char *proxy_password;
int proxy_auth_attempts;
Modified: subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/serf.c?rev=1501955&r1=1501954&r2=1501955&view=diff
==============================================================================
--- subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/branches/tristate-chunked-request/subversion/libsvn_ra_serf/serf.c Wed Jul 10 20:17:05 2013
@@ -139,6 +139,7 @@ load_http_auth_types(apr_pool_t *pool, s
static svn_error_t *
load_config(svn_ra_serf__session_t *session,
+ svn_tristate_t *using_chunked_requests,
apr_hash_t *config_hash,
apr_pool_t *pool)
{
@@ -226,7 +227,7 @@ load_config(svn_ra_serf__session_t *sess
SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS));
/* Should we use chunked transfer encopding. */
- SVN_ERR(svn_config_get_tristate(config, &session->using_chunked_requests,
+ SVN_ERR(svn_config_get_tristate(config, using_chunked_requests,
SVN_CONFIG_SECTION_GLOBAL,
SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS,
"auto",
@@ -291,11 +292,11 @@ load_config(svn_ra_serf__session_t *sess
/* Should we use chunked transfer encopding. */
SVN_ERR(svn_config_get_tristate(
- config, &session->using_chunked_requests,
+ config, using_chunked_requests,
server_group,
SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS,
"auto",
- session->using_chunked_requests));
+ *using_chunked_requests));
}
/* Don't allow the http-max-connections value to be larger than our
@@ -408,6 +409,7 @@ svn_ra_serf__open(svn_ra_session_t *sess
apr_uri_t url;
const char *client_string = NULL;
svn_error_t *err;
+ svn_tristate_t using_chunked_requests;
if (corrected_url)
*corrected_url = NULL;
@@ -462,7 +464,8 @@ svn_ra_serf__open(svn_ra_session_t *sess
* proxy does not support chunked requests. */
serf_sess->set_CL = TRUE;
- SVN_ERR(load_config(serf_sess, config, serf_sess->pool));
+ SVN_ERR(load_config(serf_sess, &using_chunked_requests, config,
+ serf_sess->pool));
serf_sess->conns[0] = apr_pcalloc(serf_sess->pool,
sizeof(*serf_sess->conns[0]));
@@ -517,17 +520,17 @@ svn_ra_serf__open(svn_ra_session_t *sess
* always use Content-Length. */
if (!serf_sess->http10)
{
- if (serf_sess->using_chunked_requests == svn_tristate_true)
+ if (using_chunked_requests == svn_tristate_true)
{
/* Upgrade to chunked Transfer-Encoding. */
serf_sess->set_CL = FALSE;
}
- else if (serf_sess->using_chunked_requests == svn_tristate_false)
+ else if (using_chunked_requests == svn_tristate_false)
{
/* Disable chunked Transfer-Encoding without probing. */
serf_sess->set_CL = TRUE;
}
- else if (serf_sess->using_chunked_requests == svn_tristate_unknown)
+ else if (using_chunked_requests == svn_tristate_unknown)
{
svn_boolean_t supports_chunked;
/* We have set up a useful connection (that doesn't indication a