Author: svn-role
Date: Tue Apr 21 19:00:00 2026
New Revision: 1933214
Log:
Merge r1931176 from trunk:
* r1931176
Update checks for SERF 1.4.0 to check for SERF 1.5.0. There will never be a
SERF 1.4.0 release and these APIs are officially available from 1.5.0 so it
should not be a functional change but make things consistent.
Justification:
Checking for nonexistent Serf releases could cause confusion
Votes:
+0: hartmannathan
+1 (not binding): brane
+1: dsahlberg, rinrab, ivan
(Side-note: This commit was half-manual by dsahlberg while investigating
why svn-role doesn't work on the new svn-qavm machine)
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/STATUS
subversion/branches/1.15.x/subversion/libsvn_ra_serf/serf.c
subversion/branches/1.15.x/subversion/libsvn_ra_serf/update.c
subversion/branches/1.15.x/subversion/libsvn_ra_serf/util.c
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Tue Apr 21 17:50:53 2026 (r1933213)
+++ subversion/branches/1.15.x/STATUS Tue Apr 21 19:00:00 2026 (r1933214)
@@ -58,17 +58,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1931176
- Update checks for SERF 1.4.0 to check for SERF 1.5.0. There will never be a
- SERF 1.4.0 release and these APIs are officially available from 1.5.0 so it
- should not be a functional change but make things consistent.
- Justification:
- Checking for nonexistent Serf releases could cause confusion
- Votes:
- +0: hartmannathan
- +1 (not binding): brane
- +1: dsahlberg, rinrab, ivan
-
* r1931549
Use bytewise content comparison in the "is the file modified?" working copy
checks if we have the pristine file content.
Modified: subversion/branches/1.15.x/subversion/libsvn_ra_serf/serf.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_ra_serf/serf.c Tue Apr 21 17:50:53 2026 (r1933213)
+++ subversion/branches/1.15.x/subversion/libsvn_ra_serf/serf.c Tue Apr 21 19:00:00 2026 (r1933214)
@@ -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/1.15.x/subversion/libsvn_ra_serf/update.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_ra_serf/update.c Tue Apr 21 17:50:53 2026 (r1933213)
+++ subversion/branches/1.15.x/subversion/libsvn_ra_serf/update.c Tue Apr 21 19:00:00 2026 (r1933214)
@@ -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/1.15.x/subversion/libsvn_ra_serf/util.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_ra_serf/util.c Tue Apr 21 17:50:53 2026 (r1933213)
+++ subversion/branches/1.15.x/subversion/libsvn_ra_serf/util.c Tue Apr 21 19:00:00 2026 (r1933214)
@@ -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,
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.