 +        request, method, uri, body, allocator, NULL);
 +}
 --- serf/src/buckets/ssl_buckets.c      2012-08-29 13:29:42.000000000 -0400
-+++ src/third_party/serf/instaweb_ssl_buckets.c 2015-07-27 10:56:12.000000000 -0400
++++ src/third_party/serf/instaweb_ssl_buckets.c 2015-08-05 17:03:31.000000000 -0400
 @@ -34,6 +34,11 @@
   * Originally developed by Aaron Bannert and Justin Erenkrantz, eBuilt.
   */

     }
 
     serf_default_destroy_and_data(bucket);


 #include <apr_pools.h>
 #include <apr_network_io.h>
 #include <apr_portable.h>
@@ -339,21 +344,9 @@
 
 static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr)
 {
-    long ret = 1;
-
-    switch (cmd) {
-    default:
-        /* abort(); */
-        break;
-    case BIO_CTRL_FLUSH:
-        /* At this point we can't force a flush. */
-        break;
-    case BIO_CTRL_PUSH:
-    case BIO_CTRL_POP:
-        ret = 0;
-        break;
-    }
-    return ret;
+    /* Note that this is probably wrong for e.g. BIO_CTRL_PENDING, where we
+     * should return 0. */
+    return 1;
 }
 
 static BIO_METHOD bio_bucket_method = {
@@ -873,7 +866,9 @@
 #if APR_HAS_THREADS
         int i, numlocks;
 #endif
