Author: dsahlberg
Date: Fri Jan 9 20:03:58 2026
New Revision: 1931201
Log:
On the serf_error_callbacks:
Catchup merge with trunk @1931200
Modified:
subversion/branches/serf_error_callbacks/ (props changed)
subversion/branches/serf_error_callbacks/subversion/include/private/svn_dep_compat.h
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/serf.c
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/update.c
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/util.c
Modified:
subversion/branches/serf_error_callbacks/subversion/include/private/svn_dep_compat.h
==============================================================================
---
subversion/branches/serf_error_callbacks/subversion/include/private/svn_dep_compat.h
Fri Jan 9 19:21:08 2026 (r1931200)
+++
subversion/branches/serf_error_callbacks/subversion/include/private/svn_dep_compat.h
Fri Jan 9 20:03:58 2026 (r1931201)
@@ -132,26 +132,6 @@ extern "C" {
#endif
/**
- * Check at compile time if the Serf version is at least a certain
- * level.
- * @param major The major version component of the version checked
- * for (e.g., the "1" of "1.3.0").
- * @param minor The minor version component of the version checked
- * for (e.g., the "3" of "1.3.0").
- * @param patch The patch level component of the version checked
- * for (e.g., the "0" of "1.3.0").
- *
- * @since New in 1.5.
- */
-#ifndef SERF_VERSION_AT_LEAST /* Introduced in Serf 0.1.1 */
-#define SERF_VERSION_AT_LEAST(major,minor,patch) \
-(((major) < SERF_MAJOR_VERSION) \
- || ((major) == SERF_MAJOR_VERSION && (minor) < SERF_MINOR_VERSION) \
- || ((major) == SERF_MAJOR_VERSION && (minor) == SERF_MINOR_VERSION && \
- (patch) <= SERF_PATCH_VERSION))
-#endif /* SERF_VERSION_AT_LEAST */
-
-/**
* By default, if libsvn is built against one version of SQLite
* and then run using an older version, svn will error out:
*
Modified:
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/ra_serf.h
==============================================================================
---
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/ra_serf.h
Fri Jan 9 19:21:08 2026 (r1931200)
+++
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/ra_serf.h
Fri Jan 9 20:03:58 2026 (r1931201)
@@ -48,11 +48,6 @@ extern "C" {
#endif /* __cplusplus */
-/* Enforce the minimum version of serf. */
-#if !SERF_VERSION_AT_LEAST(1, 2, 1)
-#error Please update your version of serf to at least 1.2.1.
-#endif
-
/** Wait duration (in microseconds) used in calls to serf_context_run() */
#define SVN_RA_SERF__CONTEXT_RUN_DURATION 500000
Modified:
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/serf.c
==============================================================================
--- subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/serf.c
Fri Jan 9 19:21:08 2026 (r1931200)
+++ subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/serf.c
Fri Jan 9 20:03:58 2026 (r1931201)
@@ -166,7 +166,7 @@ load_config(svn_ra_serf__session_t *sess
apr_port_t proxy_port;
svn_tristate_t chunked_requests;
#ifdef SVN__SERF_EXPERIMENTAL
-#if SERF_VERSION_AT_LEAST(1, 4, 0) && !defined(SVN_SERF_NO_LOGGING)
+#if SERF_VERSION_AT_LEAST(1, 5, 0) && !defined(SVN_SERF_NO_LOGGING)
apr_int64_t log_components;
apr_int64_t log_level;
#endif
@@ -255,7 +255,7 @@ load_config(svn_ra_serf__session_t *sess
"auto", svn_tristate_unknown));
#ifdef SVN__SERF_EXPERIMENTAL
-#if SERF_VERSION_AT_LEAST(1, 4, 0) && !defined(SVN_SERF_NO_LOGGING)
+#if SERF_VERSION_AT_LEAST(1, 5, 0) && !defined(SVN_SERF_NO_LOGGING)
SVN_ERR(svn_config_get_int64(config, &log_components,
SVN_CONFIG_SECTION_GLOBAL,
SVN_CONFIG_OPTION_SERF_LOG_COMPONENTS,
@@ -324,7 +324,7 @@ load_config(svn_ra_serf__session_t *sess
"auto", chunked_requests));
#ifdef SVN__SERF_EXPERIMENTAL
-#if SERF_VERSION_AT_LEAST(1, 4, 0) && !defined(SVN_SERF_NO_LOGGING)
+#if SERF_VERSION_AT_LEAST(1, 5, 0) && !defined(SVN_SERF_NO_LOGGING)
SVN_ERR(svn_config_get_int64(config, &log_components,
server_group,
SVN_CONFIG_OPTION_SERF_LOG_COMPONENTS,
@@ -338,7 +338,7 @@ load_config(svn_ra_serf__session_t *sess
}
#ifdef SVN__SERF_EXPERIMENTAL
-#if SERF_VERSION_AT_LEAST(1, 4, 0) && !defined(SVN_SERF_NO_LOGGING)
+#if SERF_VERSION_AT_LEAST(1, 5, 0) && !defined(SVN_SERF_NO_LOGGING)
if (log_components != SERF_LOGCOMP_NONE)
{
serf_log_output_t *output;
@@ -599,7 +599,7 @@ svn_ra_serf__open(svn_ra_session_t *sess
Luckily our caller now passes us two pools which handle this case.
*/
-#if defined(SVN_DEBUG) && !SERF_VERSION_AT_LEAST(1,4,0)
+#if defined(SVN_DEBUG) && !SERF_VERSION_AT_LEAST(1,5,0)
/* Currently ensured by svn_ra_open5().
If failing causes segfault in basic_tests.py 48, "basic auth test" */
SVN_ERR_ASSERT((serf_sess->pool != scratch_pool)
Modified:
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/update.c
==============================================================================
--- subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/update.c
Fri Jan 9 19:21:08 2026 (r1931200)
+++ subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/update.c
Fri Jan 9 20:03:58 2026 (r1931201)
@@ -616,7 +616,7 @@ get_best_connection(report_context_t *ct
}
else
{
-#if defined(SVN__SERF_EXPERIMENTAL) && SERF_VERSION_AT_LEAST(1, 4, 0)
+#if defined(SVN__SERF_EXPERIMENTAL) && SERF_VERSION_AT_LEAST(1, 5, 0)
/* Often one connection is slower than others, e.g. because the server
process/thread has to do more work for the particular set of requests.
In the worst case, when REQUEST_COUNT_TO_RESUME requests are queued
Modified:
subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/util.c
==============================================================================
--- subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/util.c
Fri Jan 9 19:21:08 2026 (r1931200)
+++ subversion/branches/serf_error_callbacks/subversion/libsvn_ra_serf/util.c
Fri Jan 9 20:03:58 2026 (r1931201)
@@ -482,7 +482,7 @@ load_authorities(svn_ra_serf__connection
}
#ifdef SVN__SERF_EXPERIMENTAL
-#if SERF_VERSION_AT_LEAST(1, 4, 0) && defined(SVN__SERF_TEST_HTTP2)
+#if SERF_VERSION_AT_LEAST(1, 5, 0) && defined(SVN__SERF_TEST_HTTP2)
/* Implements serf_ssl_protocol_result_cb_t */
static apr_status_t
conn_negotiate_protocol(void *data,
@@ -561,7 +561,7 @@ conn_setup(apr_socket_t *sock,
conn->session->pool));
}
#ifdef SVN__SERF_EXPERIMENTAL
-#if SERF_VERSION_AT_LEAST(1, 4, 0) && defined(SVN__SERF_TEST_HTTP2)
+#if SERF_VERSION_AT_LEAST(1, 5, 0) && defined(SVN__SERF_TEST_HTTP2)
if (APR_SUCCESS ==
serf_ssl_negotiate_protocol(conn->ssl_context, "h2,http/1.1",
conn_negotiate_protocol, conn))
@@ -2277,7 +2277,7 @@ svn_ra_serf__default_readline(serf_bucke
int *found,
const char **data, apr_size_t *len)
{
-#if defined(SVN__SERF_EXPERIMENTAL) && SERF_VERSION_AT_LEAST(1, 4, 0)
+#if defined(SVN__SERF_EXPERIMENTAL) && SERF_VERSION_AT_LEAST(1, 5, 0)
return serf_default_readline(bucket, acceptable, found, data, len);
#else
return bucket_limited_readline(bucket, acceptable, SERF_READ_ALL_AVAIL,
