<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/40a6f108894531901f353920e80d4eaeed7fa46f">https://github.com/macports/macports-ports/commit/40a6f108894531901f353920e80d4eaeed7fa46f</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 40a6f108894 nghttp2: attempt to fix build for El Capitan and below
</span>40a6f108894 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 40a6f108894531901f353920e80d4eaeed7fa46f
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Thu May 11 08:08:07 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> nghttp2: attempt to fix build for El Capitan and below
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/nghttp2/nghttp2/issues/1309
</span>---
www/nghttp2/files/1319.diff | 31 ----------------------
.../files/patch-src-shrpx_client_handler.cc.diff | 28 +++++++++++++++++--
2 files changed, 26 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/files/1319.diff b/www/nghttp2/files/1319.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4fc80f3fa0d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nghttp2/files/1319.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/shrpx_client_handler.cc b/src/shrpx_client_handler.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7789bdb415..3a6677d074 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/shrpx_client_handler.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/shrpx_client_handler.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -958,7 +958,7 @@ ClientHandler::get_downstream_connection(int &err, Downstream *downstream) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto dconn = addr->dconn_pool->pop_downstream_connection();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (dconn) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dconn->set_client_handler(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return dconn;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return std::move(dconn);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (LOG_ENABLED(INFO)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -969,7 +969,7 @@ ClientHandler::get_downstream_connection(int &err, Downstream *downstream) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dconn = std::make_unique<HttpDownstreamConnection>(group, addr, conn_.loop,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worker_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dconn->set_client_handler(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return dconn;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return std::move(dconn);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (LOG_ENABLED(INFO)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -980,7 +980,7 @@ ClientHandler::get_downstream_connection(int &err, Downstream *downstream) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto http2session = get_http2_session(group, addr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto dconn = std::make_unique<Http2DownstreamConnection>(http2session);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dconn->set_client_handler(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return dconn;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return std::move(dconn);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MemchunkPool *ClientHandler::get_mcpool() { return worker_->get_mcpool(); }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/files/patch-src-shrpx_client_handler.cc.diff b/www/nghttp2/files/patch-src-shrpx_client_handler.cc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f58b33060ef..9333ad391c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nghttp2/files/patch-src-shrpx_client_handler.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nghttp2/files/patch-src-shrpx_client_handler.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/shrpx_client_handler.cc.orig 2019-03-08 06:24:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/shrpx_client_handler.cc 2019-03-09 05:59:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/shrpx_client_handler.cc.orig 2023-05-10 03:29:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/shrpx_client_handler.cc 2023-05-11 08:00:25.000000000 -0500
</span> @@ -980,7 +980,7 @@
auto http2session = get_http2_session(group, addr);
auto dconn = std::make_unique<Http2DownstreamConnection>(http2session);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,27 @@
</span> }
MemchunkPool *ClientHandler::get_mcpool() { return worker_->get_mcpool(); }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1036,12 +1036,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case UpstreamAltMode::API: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto dconn = std::make_unique<APIDownstreamConnection>(worker_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dconn->set_client_handler(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return dconn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return std::move(dconn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case UpstreamAltMode::HEALTHMON: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto dconn = std::make_unique<HealthMonitorDownstreamConnection>();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dconn->set_client_handler(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return dconn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return std::move(dconn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1108,7 +1108,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (group->shared_addr->dnf) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto dconn = std::make_unique<NullDownstreamConnection>(group);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dconn->set_client_handler(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return dconn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return std::move(dconn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto addr = get_downstream_addr(err, group.get(), downstream);
</span></pre><pre style='margin:0'>
</pre>