diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-07-12 19:31:40 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-07-12 19:31:40 +0000 |
| commit | ffb5710ba5048473ef3ae3415262df15db4a0d87 (patch) | |
| tree | eaf2552947165efe371d90d58d666ac19cc07009 /www/apache24/files/patch-modules_ssl_ssl__engine__io.c | |
| parent | www/apache22: Update to 2.2.34 (diff) | |
www/apache24: Update to 2.4.27
- Bugfix update to 2.4.27
- Fix build with LibreSSL [1]
- Add brotli compression option
- Add pkg-message for 10.3 base-ssl users
- HTTP/2 is production ready, default enable
- warn users of 10.3 for mod_http2/OpenSSL 1.0.1
[1] https://bz.apache.org/bugzilla/show_bug.cgi?id=61184
PR: 220160 [1]
Reported by: Markus Kohlmeyer <rootservice@gmail.com>
Reviewed by: ohauer (hat)
Approved by: ohauer (hat)
Differential Revision: https://reviews.freebsd.org/D11285
Diffstat (limited to 'www/apache24/files/patch-modules_ssl_ssl__engine__io.c')
| -rw-r--r-- | www/apache24/files/patch-modules_ssl_ssl__engine__io.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c new file mode 100644 index 000000000000..85787aeb5498 --- /dev/null +++ b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c @@ -0,0 +1,38 @@ +--- modules/ssl/ssl_engine_io.c.orig 2017-05-30 12:26:05 UTC ++++ modules/ssl/ssl_engine_io.c +@@ -164,7 +164,7 @@ static int bio_filter_create(BIO *bio) + { + BIO_set_shutdown(bio, 1); + BIO_set_init(bio, 1); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + /* No setter method for OpenSSL 1.1.0 available, + * but I can't find any functional use of the + * "num" field there either. +@@ -549,7 +549,7 @@ static long bio_filter_in_ctrl(BIO *bio, + return -1; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + static BIO_METHOD bio_filter_out_method = { + BIO_TYPE_MEM, +@@ -2024,7 +2024,7 @@ static void ssl_io_input_add_filter(ssl_ + + filter_ctx->pInputFilter = ap_add_input_filter(ssl_io_filter, inctx, r, c); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + filter_ctx->pbioRead = BIO_new(&bio_filter_in_method); + #else + filter_ctx->pbioRead = BIO_new(bio_filter_in_method); +@@ -2059,7 +2059,7 @@ void ssl_io_filter_init(conn_rec *c, req + filter_ctx->pOutputFilter = ap_add_output_filter(ssl_io_filter, + filter_ctx, r, c); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + filter_ctx->pbioWrite = BIO_new(&bio_filter_out_method); + #else + filter_ctx->pbioWrite = BIO_new(bio_filter_out_method); |