diff options
Diffstat (limited to 'www/apache24/files')
| -rw-r--r-- | www/apache24/files/patch-Makefile.in | 4 | ||||
| -rw-r--r-- | www/apache24/files/patch-modules_ssl_ssl__engine__io.c | 17 |
2 files changed, 2 insertions, 19 deletions
diff --git a/www/apache24/files/patch-Makefile.in b/www/apache24/files/patch-Makefile.in index 7dcfab1dab67..e749f55fc75a 100644 --- a/www/apache24/files/patch-Makefile.in +++ b/www/apache24/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2015-04-15 18:06:04 UTC +--- Makefile.in.orig 2016-03-20 15:51:49 UTC +++ Makefile.in @@ -32,12 +32,9 @@ include $(top_srcdir)/build/program.mk install-conf: @@ -90,7 +90,7 @@ install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) -@@ -251,12 +222,7 @@ install-man: +@@ -252,12 +223,7 @@ install-man: @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 diff --git a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c deleted file mode 100644 index 9f067f84d896..000000000000 --- a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c +++ /dev/null @@ -1,17 +0,0 @@ -Backport openssl 0.9.8x patch: -http://svn.apache.org/r1719967 - -For discussion see: -http://marc.info/?t=145011265700003&r=1&w=2 -=============================================================== ---- modules/ssl/ssl_engine_io.c.orig 2015-11-19 19:55:25 UTC -+++ modules/ssl/ssl_engine_io.c -@@ -217,7 +217,7 @@ static int bio_filter_out_write(BIO *bio - * so limit the performance impact to handshake time. - */ - #if OPENSSL_VERSION_NUMBER < 0x0009080df -- need_flush = !SSL_is_init_finished(outctx->filter_ctx->pssl) -+ need_flush = !SSL_is_init_finished(outctx->filter_ctx->pssl); - #else - need_flush = SSL_in_connect_init(outctx->filter_ctx->pssl); - #endif |