You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2012/11/21 03:35:11 UTC
svn commit: r1411976 - in /subversion/trunk/subversion/libsvn_ra_serf:
replay.c serf.c update.c util.c
Author: cmpilato
Date: Wed Nov 21 02:35:10 2012
New Revision: 1411976
URL: http://svn.apache.org/viewvc?rev=1411976&view=rev
Log:
Allow 'http-timeout' to be set to 0 in ra_serf as it could be for
ra_neon (to indicate "no timeout").
* subversion/libsvn_ra_serf/serf.c
(load_config): Allow timeout value of 0.
* subversion/libsvn_ra_serf/replay.c
(svn_ra_serf__replay_range): If the session timeout is 0, don't
bother tracking the "wait time remaining".
* subversion/libsvn_ra_serf/update.c
(finish_report): Same here.
* subversion/libsvn_ra_serf/util.c
(svn_ra_serf__context_run_wait): And again here.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/replay.c
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/replay.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/replay.c?rev=1411976&r1=1411975&r2=1411976&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/replay.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/replay.c Wed Nov 21 02:35:10 2012
@@ -873,14 +873,17 @@ svn_ra_serf__replay_range(svn_ra_session
err = SVN_NO_ERROR;
status = 0;
- if (waittime_left > SVN_RA_SERF__CONTEXT_RUN_DURATION)
+ if (session->timeout)
{
- waittime_left -= SVN_RA_SERF__CONTEXT_RUN_DURATION;
- }
- else
- {
- return svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
- _("Connection timed out"));
+ if (waittime_left > SVN_RA_SERF__CONTEXT_RUN_DURATION)
+ {
+ waittime_left -= SVN_RA_SERF__CONTEXT_RUN_DURATION;
+ }
+ else
+ {
+ return svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
+ _("Connection timed out"));
+ }
}
}
else
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1411976&r1=1411975&r2=1411976&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Wed Nov 21 02:35:10 2012
@@ -272,7 +272,7 @@ load_config(svn_ra_serf__session_t *sess
_("Invalid config: negative timeout value"));
session->timeout = apr_time_from_sec(timeout);
}
- SVN_ERR_ASSERT(session->timeout > 0);
+ SVN_ERR_ASSERT(session->timeout >= 0);
/* Convert the proxy port value, if any. */
if (port_str)
Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1411976&r1=1411975&r2=1411976&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Wed Nov 21 02:35:10 2012
@@ -2666,14 +2666,17 @@ finish_report(void *report_baton,
err = SVN_NO_ERROR;
status = 0;
- if (waittime_left > SVN_RA_SERF__CONTEXT_RUN_DURATION)
+ if (sess->timeout)
{
- waittime_left -= SVN_RA_SERF__CONTEXT_RUN_DURATION;
- }
- else
- {
- return svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
- _("Connection timed out"));
+ if (waittime_left > SVN_RA_SERF__CONTEXT_RUN_DURATION)
+ {
+ waittime_left -= SVN_RA_SERF__CONTEXT_RUN_DURATION;
+ }
+ else
+ {
+ return svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
+ _("Connection timed out"));
+ }
}
}
else
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1411976&r1=1411975&r2=1411976&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Wed Nov 21 02:35:10 2012
@@ -751,14 +751,17 @@ svn_ra_serf__context_run_wait(svn_boolea
err = SVN_NO_ERROR;
status = 0;
- if (waittime_left > SVN_RA_SERF__CONTEXT_RUN_DURATION)
+ if (sess->timeout)
{
- waittime_left -= SVN_RA_SERF__CONTEXT_RUN_DURATION;
- }
- else
- {
- return svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
- _("Connection timed out"));
+ if (waittime_left > SVN_RA_SERF__CONTEXT_RUN_DURATION)
+ {
+ waittime_left -= SVN_RA_SERF__CONTEXT_RUN_DURATION;
+ }
+ else
+ {
+ return svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
+ _("Connection timed out"));
+ }
}
}
else