Author: brane
Date: Tue May 1 17:26:24 2018
New Revision: 1830694
URL: http://svn.apache.org/viewvc?rev=1830694&view=rev
Log:
On the ocsp-verification branch: Sync with trunk up to r1830693.
Modified:
serf/branches/ocsp-verification/ (props changed)
serf/branches/ocsp-verification/test/test_buckets.c
Propchange: serf/branches/ocsp-verification/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 1 17:26:24 2018
@@ -3,4 +3,4 @@
/serf/branches/get-remaining:1701859-1708111
/serf/branches/multiple_ssl_impls:1699382
/serf/branches/windows-sspi:1698866-1698877
-/serf/trunk:1771884-1830691
+/serf/trunk:1771884-1830693
Modified: serf/branches/ocsp-verification/test/test_buckets.c
URL:
http://svn.apache.org/viewvc/serf/branches/ocsp-verification/test/test_buckets.c?rev=1830694&r1=1830693&r2=1830694&view=diff
==============================================================================
--- serf/branches/ocsp-verification/test/test_buckets.c (original)
+++ serf/branches/ocsp-verification/test/test_buckets.c Tue May 1 17:26:24 2018
@@ -2046,6 +2046,7 @@ static void test_deflate_buckets(CuTest
}
}
+#ifdef SERF_TEST_DEFLATE_4GBPLUS_BUCKETS
static apr_status_t hold_open(void *baton, serf_bucket_t *aggbkt)
{
test_baton_t *tb = baton;
@@ -2089,7 +2090,6 @@ create_gzip_deflate_bucket(serf_bucket_t
return defbkt;
}
-#ifdef SERF_TEST_DEFLATE_4GBPLUS_BUCKETS
/* Test for issue #152: the trailers of gzipped data only store the 4 most
significant bytes of the length, so when the compressed data is >4GB
we can't just compare actual length with expected length. */
