summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/serf/Makefile2
-rw-r--r--www/serf/files/patch-buckets_ssl__buckets.c19
2 files changed, 19 insertions, 2 deletions
diff --git a/www/serf/Makefile b/www/serf/Makefile
index d63504e64238..47b81f61e90c 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= serf
PORTVERSION= 1.3.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= APACHE/serf
diff --git a/www/serf/files/patch-buckets_ssl__buckets.c b/www/serf/files/patch-buckets_ssl__buckets.c
index 27f8c154e2aa..b8bd6ad1c763 100644
--- a/www/serf/files/patch-buckets_ssl__buckets.c
+++ b/www/serf/files/patch-buckets_ssl__buckets.c
@@ -1,6 +1,23 @@
--- buckets/ssl_buckets.c.orig 2016-06-30 15:45:07 UTC
+++ buckets/ssl_buckets.c
-@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
+@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio)
+
+ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr)
+ {
+- long ret = 1;
++ long ret = 0;
+
+ switch (cmd) {
+ default:
+@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long nu
+ break;
+ case BIO_CTRL_FLUSH:
+ /* At this point we can't force a flush. */
++ ret = 1;
+ break;
+ case BIO_CTRL_PUSH:
+ case BIO_CTRL_POP:
+@@ -1156,7 +1157,7 @@ static void init_ssl_libraries(void)
}
#endif