Date: Fri, 19 Apr 2019 23:26:15 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499399 - in head/www/nghttp2: . files Message-ID: <201904192326.x3JNQFhA022068@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Fri Apr 19 23:26:15 2019 New Revision: 499399 URL: https://svnweb.freebsd.org/changeset/ports/499399 Log: Move upstream patch to files directory Obtained from: https://github.com/nghttp2/nghttp2/commit/cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 Added: head/www/nghttp2/files/patch-src-asio_server_connection.h (contents, props changed) Modified: head/www/nghttp2/Makefile Modified: head/www/nghttp2/Makefile ============================================================================== --- head/www/nghttp2/Makefile Fri Apr 19 23:26:10 2019 (r499398) +++ head/www/nghttp2/Makefile Fri Apr 19 23:26:15 2019 (r499399) @@ -6,9 +6,6 @@ PORTVERSION= 1.38.0 DISTVERSIONPREFIX= v CATEGORIES= www net -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= cbba1ebf8fce.patch:-p1 - MAINTAINER= sunpoet@FreeBSD.org COMMENT= HTTP/2.0 C Library Added: head/www/nghttp2/files/patch-src-asio_server_connection.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nghttp2/files/patch-src-asio_server_connection.h Fri Apr 19 23:26:15 2019 (r499399) @@ -0,0 +1,35 @@ +Obtained from: https://github.com/nghttp2/nghttp2/commit/cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 + +--- src/asio_server_connection.h.orig 2019-04-18 06:08:36 UTC ++++ src/asio_server_connection.h +@@ -51,6 +51,12 @@ + #include "util.h" + #include "template.h" + ++#if BOOST_VERSION >= 107000 ++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) ++#else ++#define GET_IO_SERVICE(s) ((s).get_io_service()) ++#endif ++ + namespace nghttp2 { + + namespace asio_http2 { +@@ -71,7 +77,7 @@ public: + SocketArgs &&... args) + : socket_(std::forward<SocketArgs>(args)...), + mux_(mux), +- deadline_(socket_.get_io_service()), ++ deadline_(GET_IO_SERVICE(socket_)), + tls_handshake_timeout_(tls_handshake_timeout), + read_timeout_(read_timeout), + writing_(false), +@@ -82,7 +88,7 @@ public: + boost::system::error_code ec; + + handler_ = std::make_shared<http2_handler>( +- socket_.get_io_service(), socket_.lowest_layer().remote_endpoint(ec), ++ GET_IO_SERVICE(socket_), socket_.lowest_layer().remote_endpoint(ec), + [this]() { do_write(); }, mux_); + if (handler_->start() != 0) { + stop();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904192326.x3JNQFhA022068>