diff options
| -rw-r--r-- | www/apache24/Makefile | 2 | ||||
| -rw-r--r-- | www/apache24/distinfo | 4 | ||||
| -rw-r--r-- | www/apache24/files/patch-configure.in | 2 | ||||
| -rw-r--r-- | www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in | 8 | ||||
| -rw-r--r-- | www/apache24/files/patch-docs__conf__httpd.conf.in | 8 | ||||
| -rw-r--r-- | www/apache24/files/patch-modules_ssl_ssl__engine__io.c | 17 |
6 files changed, 29 insertions, 12 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index a53e2ee046c2..4f463989d454 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.17 +PORTVERSION= 2.4.18 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} diff --git a/www/apache24/distinfo b/www/apache24/distinfo index 509b34f09d68..f8ec62a79d8e 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,2 +1,2 @@ -SHA256 (apache24/httpd-2.4.17.tar.bz2) = 331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798 -SIZE (apache24/httpd-2.4.17.tar.bz2) = 5157721 +SHA256 (apache24/httpd-2.4.18.tar.bz2) = 0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c +SIZE (apache24/httpd-2.4.18.tar.bz2) = 5181291 diff --git a/www/apache24/files/patch-configure.in b/www/apache24/files/patch-configure.in index ee496f0b8eb7..8aaaa9e11831 100644 --- a/www/apache24/files/patch-configure.in +++ b/www/apache24/files/patch-configure.in @@ -1,4 +1,4 @@ ---- configure.in.orig 2015-01-22 17:33:07 UTC +--- configure.in.orig 2015-09-05 17:02:03 UTC +++ configure.in @@ -111,7 +111,7 @@ fi diff --git a/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in b/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in index a74e8e10edc9..7c785f2fdf94 100644 --- a/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in +++ b/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in @@ -1,6 +1,6 @@ ---- docs/conf/extra/httpd-ssl.conf.in.orig 2015-05-27 13:59:59.000000000 -0500 -+++ docs/conf/extra/httpd-ssl.conf.in 2015-07-15 09:50:31.369623000 -0500 -@@ -124,8 +124,8 @@ +--- docs/conf/extra/httpd-ssl.conf.in.orig 2015-05-27 18:59:59 UTC ++++ docs/conf/extra/httpd-ssl.conf.in +@@ -124,8 +124,8 @@ SSLSessionCacheTimeout 300 DocumentRoot "@exp_htdocsdir@" ServerName www.example.com:@@SSLPort@@ ServerAdmin you@example.com @@ -11,7 +11,7 @@ # SSL Engine Switch: # Enable/Disable SSL for this virtual host. -@@ -284,7 +284,7 @@ +@@ -284,7 +284,7 @@ BrowserMatch "MSIE [2-5]" \ # Per-Server Logging: # The home of a custom SSL log file. Use this when you want a # compact non-error SSL logfile on a virtual host basis. diff --git a/www/apache24/files/patch-docs__conf__httpd.conf.in b/www/apache24/files/patch-docs__conf__httpd.conf.in index 35f81ccb0c65..1fa3f1770a8e 100644 --- a/www/apache24/files/patch-docs__conf__httpd.conf.in +++ b/www/apache24/files/patch-docs__conf__httpd.conf.in @@ -1,4 +1,4 @@ ---- docs/conf/httpd.conf.in.orig 2012-11-08 03:05:38 UTC +--- docs/conf/httpd.conf.in.orig 2015-11-03 11:58:58 UTC +++ docs/conf/httpd.conf.in @@ -65,6 +65,9 @@ Listen @@Port@@ # @@ -46,9 +46,9 @@ </IfModule> <IfModule alias_module> -@@ -418,3 +421,5 @@ SSLRandomSeed connect builtin - #RequestHeader unset DNT env=bad_DNT - #</IfModule> +@@ -407,3 +410,5 @@ SSLRandomSeed startup builtin + SSLRandomSeed connect builtin + </IfModule> +Include @rel_sysconfdir@/Includes/*.conf + 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..9f067f84d896 --- /dev/null +++ b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c @@ -0,0 +1,17 @@ +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 |