cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r563962

Browse Source 
Fix incompatibility with KTLS.

PR:		253214
Submitted by:	madpilot@FreeBSD.org

Approved by:	portmgr (blanket, FAQ 20.6.2)
This commit is contained in:
Lev A. Serebryakov 2021-02-04 11:38:06 +00:00
parent 2e23b81562
commit 973ad92f2c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2021Q1/; revision=564018
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/serf/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= serf
PORTVERSION= 1.3.9
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= APACHE/serf

19
www/serf/files/patch-buckets_ssl__buckets.c
View File

@ -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