Attachment #222115 for bug #253214

View | Details | Raw Unified | Return to bug 253214
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-1 / +1 lines)
3		3
4	PORTNAME= serf	4	PORTNAME= serf
5	PORTVERSION= 1.3.9	5	PORTVERSION= 1.3.9
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= APACHE/serf	8	MASTER_SITES= APACHE/serf
9		9




--- buckets/ssl_buckets.c.orig	2016-06-30 15:45:07 UTC
+++ buckets/ssl_buckets.c
@@ -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
 

Return to bug 253214

Lines 1-6 Link Here

(-)files/patch-buckets_ssl__buckets.c (-1 / +18 lines)
1	--- buckets/ssl_buckets.c.orig 2016-06-30 15:45:07 UTC	1	--- buckets/ssl_buckets.c.orig 2016-06-30 15:45:07 UTC
2	+++ buckets/ssl_buckets.c	2	+++ buckets/ssl_buckets.c
3	@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)	3	@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio)
		4
		5	static long bio_bucket_ctrl(BIO bio, int cmd, long num, void ptr)
		6	{
		7	- long ret = 1;
		8	+ long ret = 0;
		9
		10	switch (cmd) {
		11	default:
		12	@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long nu
		13	break;
		14	case BIO_CTRL_FLUSH:
		15	/* At this point we can't force a flush. */
		16	+ ret = 1;
		17	break;
		18	case BIO_CTRL_PUSH:
		19	case BIO_CTRL_POP:
		20	@@ -1156,7 +1157,7 @@ static void init_ssl_libraries(void)
4	}	21	}
5	#endif	22	#endif
6		23