You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/11/11 19:37:20 UTC
svn commit: r1713910 - in /subversion/trunk/subversion/libsvn_ra_serf:
eagain_bucket.c sb_bucket.c
Author: rhuijben
Date: Wed Nov 11 18:37:20 2015
New Revision: 1713910
URL: http://svn.apache.org/viewvc?rev=1713910&view=rev
Log:
When using a new enough serf, stop using our own stubs that just raise a
malfunction error.
* subversion/libsvn_ra_serf/eagain_bucket.c
(eagain_bucket_readline,
delay_bucket_vtable): Don't define+use with new serf.
* subversion/libsvn_ra_serf/sb_bucket.c
(sb_bucket_readline,
sb_bucket_vtable): Don't define+use with new serf.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/eagain_bucket.c
subversion/trunk/subversion/libsvn_ra_serf/sb_bucket.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/eagain_bucket.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/eagain_bucket.c?rev=1713910&r1=1713909&r2=1713910&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/eagain_bucket.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/eagain_bucket.c Wed Nov 11 18:37:20 2015
@@ -66,7 +66,7 @@ eagain_bucket_read(serf_bucket_t *bucket
return APR_EAGAIN;
}
-
+#if !SERF_VERSION_AT_LEAST(1, 4, 0)
static apr_status_t
eagain_bucket_readline(serf_bucket_t *bucket,
int acceptable,
@@ -79,6 +79,7 @@ eagain_bucket_readline(serf_bucket_t *bu
"Not implemented."));
return APR_ENOTIMPL;
}
+#endif
static apr_status_t
@@ -98,7 +99,11 @@ eagain_bucket_peek(serf_bucket_t *bucket
static const serf_bucket_type_t delay_bucket_vtable = {
"BUF-EAGAIN",
eagain_bucket_read,
+#if SERF_VERSION_AT_LEAST(1, 4, 0)
+ serf_default_readline,
+#else
eagain_bucket_readline,
+#endif
serf_default_read_iovec,
serf_default_read_for_sendfile,
serf_default_read_bucket,
Modified: subversion/trunk/subversion/libsvn_ra_serf/sb_bucket.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/sb_bucket.c?rev=1713910&r1=1713909&r2=1713910&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/sb_bucket.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/sb_bucket.c Wed Nov 11 18:37:20 2015
@@ -117,7 +117,7 @@ sb_bucket_read(serf_bucket_t *bucket, ap
return *data == NULL ? APR_EOF : APR_SUCCESS;
}
-
+#if !SERF_VERSION_AT_LEAST(1, 4, 0)
static apr_status_t
sb_bucket_readline(serf_bucket_t *bucket, int acceptable,
int *found,
@@ -128,6 +128,7 @@ sb_bucket_readline(serf_bucket_t *bucket
"Not implemented."));
return APR_ENOTIMPL;
}
+#endif
static apr_status_t
@@ -159,7 +160,11 @@ sb_bucket_peek(serf_bucket_t *bucket,
static const serf_bucket_type_t sb_bucket_vtable = {
"SPILLBUF",
sb_bucket_read,
+#if SERF_VERSION_AT_LEAST(1, 4, 0)
+ serf_default_readline,
+#else
sb_bucket_readline,
+#endif
serf_default_read_iovec,
serf_default_read_for_sendfile,
serf_default_read_bucket,