Page MenuHomeFreeBSD
Files F163438240

D28932.diff
No OneTemporary
Actions

D28932.diff
View Options

Index: head/www/apache24/Makefile
===================================================================
--- head/www/apache24/Makefile
+++ head/www/apache24/Makefile
@@ -2,7 +2,7 @@
PORTNAME= apache24
PORTVERSION= 2.4.46
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}
Index: head/www/apache24/files/patch-modules_ssl_ssl__engine__io.c
===================================================================
--- head/www/apache24/files/patch-modules_ssl_ssl__engine__io.c
+++ head/www/apache24/files/patch-modules_ssl_ssl__engine__io.c
@@ -0,0 +1,38 @@
+--- modules/ssl/ssl_engine_io.c.orig 2020-02-20 16:33:40.000000000 -0800
++++ modules/ssl/ssl_engine_io.c 2021-02-25 16:08:04.863228000 -0800
+@@ -242,7 +242,7 @@ static int bio_filter_out_write(BIO *bio, const char *
+
+ static long bio_filter_out_ctrl(BIO *bio, int cmd, long num, void *ptr)
+ {
+- long ret = 1;
++ long ret = 0;
+ bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)BIO_get_data(bio);
+
+ switch (cmd) {
+@@ -542,7 +542,7 @@ static int bio_filter_in_gets(BIO *bio, char *buf, int
+
+ static long bio_filter_in_ctrl(BIO *bio, int cmd, long num, void *ptr)
+ {
+- return -1;
++ return 0;
+ }
+
+ #if MODSSL_USE_OPENSSL_PRE_1_1_API
+@@ -567,7 +567,7 @@ static BIO_METHOD bio_filter_in_method = {
+ bio_filter_in_read,
+ bio_filter_in_puts, /* puts is never called */
+ bio_filter_in_gets, /* gets is never called */
+- bio_filter_in_ctrl, /* ctrl is never called */
++ bio_filter_in_ctrl,
+ bio_filter_create,
+ bio_filter_destroy,
+ NULL
+@@ -594,7 +594,7 @@ void init_bio_methods(void)
+ BIO_meth_set_read(bio_filter_in_method, &bio_filter_in_read);
+ BIO_meth_set_puts(bio_filter_in_method, &bio_filter_in_puts); /* puts is never called */
+ BIO_meth_set_gets(bio_filter_in_method, &bio_filter_in_gets); /* gets is never called */
+- BIO_meth_set_ctrl(bio_filter_in_method, &bio_filter_in_ctrl); /* ctrl is never called */
++ BIO_meth_set_ctrl(bio_filter_in_method, &bio_filter_in_ctrl);
+ BIO_meth_set_create(bio_filter_in_method, &bio_filter_create);
+ BIO_meth_set_destroy(bio_filter_in_method, &bio_filter_destroy);
+ }

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 24, 5:07 AM (1 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35371360
Default Alt Text
D28932.diff (2 KB)

Event Timeline