<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ecf4e70ac19a2b3ec2147489e3568da32d7cdeb6">https://github.com/macports/macports-ports/commit/ecf4e70ac19a2b3ec2147489e3568da32d7cdeb6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ecf4e70ac19 macos-fortress: Default configuration for HTTP/2 keep alive behavior
</span>ecf4e70ac19 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ecf4e70ac19a2b3ec2147489e3568da32d7cdeb6
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Nov 3 19:41:06 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> macos-fortress: Default configuration for HTTP/2 keep alive behavior
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Make default privoxy config consistent with #12792
</span>---
net/macos-fortress/files/privoxy-config.macports | 8 +++---
net/macos-fortress/files/privoxy-config.patch | 31 +++++++++++-------------
2 files changed, 18 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/macos-fortress/files/privoxy-config.macports b/net/macos-fortress/files/privoxy-config.macports
</span><span style='display:block; white-space:pre;color:#808080;'>index 0921e30a3b5..6f7fbda49f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/macos-fortress/files/privoxy-config.macports
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/macos-fortress/files/privoxy-config.macports
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1716,7 +1716,7 @@ split-large-forms 0
</span> #
# keep-alive-timeout 300
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-keep-alive-timeout 300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#keep-alive-timeout 5
</span> #
# 6.5. tolerate-pipelining
# =========================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1759,7 +1759,7 @@ keep-alive-timeout 300
</span> #
# tolerate-pipelining 1
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#tolerate-pipelining 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tolerate-pipelining 1
</span> #
# 6.6. default-server-timeout
# ============================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1810,7 +1810,7 @@ keep-alive-timeout 300
</span> #
# default-server-timeout 60
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default-server-timeout 60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#default-server-timeout 5
</span> #
# 6.7. connection-sharing
# ========================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1880,7 +1880,7 @@ default-server-timeout 60
</span> #
# connection-sharing 1
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-connection-sharing 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#connection-sharing 1
</span> #
# 6.8. socket-timeout
# ====================
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/macos-fortress/files/privoxy-config.patch b/net/macos-fortress/files/privoxy-config.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 24b1b5a3cd1..564c9af39c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/macos-fortress/files/privoxy-config.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/macos-fortress/files/privoxy-config.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./config 2021-10-23 04:48:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./config 2021-10-23 05:03:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./config 2021-10-06 21:08:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./config 2021-11-03 19:32:55.000000000 -0400
</span> @@ -192,6 +192,7 @@
# shown.
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,30 +8,26 @@
</span> #
# 1.4. proxy-info-url
# ====================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -385,8 +386,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -385,6 +386,9 @@
</span> actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.
actionsfile default.action # Main actions file
actionsfile user.action # User customizations
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#actionsfile @PREFIX@/etc/adblock2privoxy/privoxy/ab2p.system.action
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#actionsfile @PREFIX@/etc/adblock2privoxy/privoxy/ab2p.action
</span> +actionsfile @PREFIX@/etc/macos-fortress/macos-fortress-hosts.action
+actionsfile @PREFIX@/etc/adblock3privoxy/privoxy/ab2p.system.action
+actionsfile @PREFIX@/etc/adblock2privoxy/privoxy/ab2p.action
#actionsfile regression-tests.action # Tests for privoxy-regression-test
#
# 2.6. filterfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -433,8 +435,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -431,6 +435,8 @@
</span> #
filterfile default.filter
filterfile user.filter # User customizations
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#filterfile @PREFIX@/etc/adblock2privoxy/privoxy/ab2p.system.filter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#filterfile @PREFIX@/etc/adblock2privoxy/privoxy/ab2p.filter
</span> +filterfile @PREFIX@/etc/adblock2privoxy/privoxy/ab2p.system.filter
+filterfile @PREFIX@/etc/adblock2privoxy/privoxy/ab2p.filter
#
# 2.7. logfile
# =============
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -679,7 +681,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -675,7 +681,7 @@
</span> # Note that Privoxy does not validate the specified hostname
# value.
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +36,7 @@
</span> #
# 4. ACCESS CONTROL AND SECURITY
# ===============================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -788,7 +790,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -784,7 +790,7 @@
</span> #
# listen-address [::1]:8118
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,15 +45,16 @@
</span> #
# 4.2. toggle
# ============
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1367,6 +1369,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1363,6 +1369,12 @@
</span> # forward <[2-3][0-9a-f][0-9a-f][0-9a-f]:*> .
#
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+forward / .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+forward :443 .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# I2P
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#forward .i2p @PROXY_HOSTNAME@:4443
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++forward / .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++forward :443 .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# I2P
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#forward .i2p @PROXY_HOSTNAME@:4443
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> # 5.2. forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t
# =========================================================================
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span></pre><pre style='margin:0'>
</pre>