Index: head/net/pichi/Makefile
===================================================================
--- head/net/pichi/Makefile	(revision 548460)
+++ head/net/pichi/Makefile	(revision 548461)
@@ -1,75 +1,75 @@
 # $FreeBSD$
 
 PORTNAME=	pichi
-DISTVERSION=	1.3.0
+DISTVERSION=	1.3.1
 CATEGORIES=	net
 
 MAINTAINER=	pichi@elude.in
 COMMENT=	Flexible rule-based proxy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rapidjson>=1.1.0:devel/rapidjson
 
 USES=		cmake compiler:c++17-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pichi-router
 
 USE_RC_SUBR=	pichi
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 CMAKE_BUILD_TYPE=	MinSizeRel
 CMAKE_ARGS=		-DVERSION=${DISTVERSION}
 CMAKE_ON=		BUILD_SERVER BUILD_TEST
 INSTALL_TARGET=		install/strip
 TEST_TARGET=		test
 
 OPTIONS_DEFINE=		DEVEL STATIC TLS
 OPTIONS_DEFAULT=	TLS
 OPTIONS_SUB=		yes
 
 TLS_DESC=		Enable TLS support ( requiring OpenSSL )
 TLS_CMAKE_BOOL=		ENABLE_TLS
 
 STATIC_DESC=		Static linking
 STATIC_CMAKE_BOOL=	STATIC_LINK
 STATIC_BUILD_DEPENDS=	boost-libs>=1.67.0:devel/boost-libs \
 			libmaxminddb>=1.3.0:net/libmaxminddb \
 			libsodium>=1.0.12:security/libsodium \
 			mbedtls>=2.7.0:security/mbedtls
 STATIC_LIB_DEPENDS_OFF=	libboost_context.so:devel/boost-libs \
 			libboost_filesystem.so:devel/boost-libs \
 			libboost_program_options.so:devel/boost-libs \
 			libboost_system.so:devel/boost-libs \
 			libmaxminddb.so:net/libmaxminddb \
 			libmbedcrypto.so:security/mbedtls \
 			libmbedtls.so:security/mbedtls \
 			libmbedx509.so:security/mbedtls \
 			libsodium.so:security/libsodium
 STATIC_USE_OFF=		LDCONFIG=yes
 
 DEVEL_DESC=		Install development files
 DEVEL_CMAKE_BOOL=	INSTALL_DEVEL
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTLS}
 .if ${PORT_OPTIONS:MSTATIC}
 USES+=		ssl:build
 .else
 USES+=		ssl
 .endif
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/test/geo.mmdb ${STAGEDIR}${ETCDIR}/geo.mmdb
 	${INSTALL_DATA} ${WRKSRC}/server/pichi.json.default ${STAGEDIR}${ETCDIR}/pichi.json.sample
 
 post-install-DEVEL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/pichi.h ${STAGEDIR}${PREFIX}/include/pichi.h
 
 .include <bsd.port.mk>
Index: head/net/pichi/distinfo
===================================================================
--- head/net/pichi/distinfo	(revision 548460)
+++ head/net/pichi/distinfo	(revision 548461)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554899633
-SHA256 (pichi-router-pichi-1.3.0_GH0.tar.gz) = f5686a1e7c98d9c9eca88d88af53b85648ceeff9aa33bf2b1d95a09462d74d1c
-SIZE (pichi-router-pichi-1.3.0_GH0.tar.gz) = 2066723
+TIMESTAMP = 1599981725
+SHA256 (pichi-router-pichi-1.3.1_GH0.tar.gz) = be1dc4d501387ef3524697ac804bec3ceb235a0c323ef8901532f04b0fab5cac
+SIZE (pichi-router-pichi-1.3.1_GH0.tar.gz) = 2068432
Index: head/net/pichi/files/patch-test_endpoint.cpp
===================================================================
--- head/net/pichi/files/patch-test_endpoint.cpp	(revision 548460)
+++ head/net/pichi/files/patch-test_endpoint.cpp	(nonexistent)
@@ -1,12 +0,0 @@
---- test/endpoint.cpp.orig	1970-01-01 00:00:00 UTC
-+++ test/endpoint.cpp
-@@ -132,7 +132,8 @@ BOOST_AUTO_TEST_CASE(serialize_Domain)
- #ifndef HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
-       <uint8_t, 13>
- #endif // HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
--      {0x03, 0x09, 'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't', 0x01, 0xbb};
-+      {0x03_u8, 0x09_u8, 0x6c_u8, 0x6f_u8, 0x63_u8, 0x61_u8, 0x6c_u8,
-+       0x68_u8, 0x6f_u8, 0x73_u8, 0x74_u8, 0x01_u8, 0xbb_u8};
- 
-   auto fact = array<uint8_t, 13>{};
-   auto len = serializeEndpoint(makeEndpoint(host, port), fact);

Property changes on: head/net/pichi/files/patch-test_endpoint.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/pichi/files/patch-test_method.cpp
===================================================================
--- head/net/pichi/files/patch-test_method.cpp	(revision 548460)
+++ head/net/pichi/files/patch-test_method.cpp	(nonexistent)
@@ -1,9 +0,0 @@
---- test/method.cpp.orig	1970-01-01 00:00:00 UTC
-+++ test/method.cpp
-@@ -1,5 +1,6 @@
- #define BOOST_TEST_MODULE pichi method test
- 
-+#include "utils.hpp"
- #include <boost/test/unit_test.hpp>
- #include <pichi/common.hpp>
- #include <pichi/crypto/method.hpp>

Property changes on: head/net/pichi/files/patch-test_method.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/pichi/files/patch-server_main.cpp
===================================================================
--- head/net/pichi/files/patch-server_main.cpp	(revision 548460)
+++ head/net/pichi/files/patch-server_main.cpp	(nonexistent)
@@ -1,15 +0,0 @@
---- server/main.cpp.orig	1970-01-01 00:00:00 UTC
-+++ server/main.cpp
-@@ -1,10 +1,11 @@
-+#include <pichi/config.hpp>
-+// Include config.hpp first
- #include <boost/filesystem/operations.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/program_options.hpp>
- #include <fstream>
- #include <iostream>
- #include <memory>
--#include <pichi/config.hpp>
- #include <stdio.h>
- #ifdef HAS_UNISTD_H
- #include <errno.h>

Property changes on: head/net/pichi/files/patch-server_main.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/pichi/files/patch-test_utils.hpp
===================================================================
--- head/net/pichi/files/patch-test_utils.hpp	(revision 548460)
+++ head/net/pichi/files/patch-test_utils.hpp	(nonexistent)
@@ -1,11 +0,0 @@
---- test/utils.hpp.orig	1970-01-01 00:00:00 UTC
-+++ test/utils.hpp
-@@ -1,6 +1,8 @@
- #ifndef PICHI_TEST_UTILS_HPP
- #define PICHI_TEST_UTILS_HPP
- 
-+#include <pichi/config.hpp>
-+// Include config.hpp first
- #include <boost/asio/error.hpp>
- #include <boost/beast/http/error.hpp>
- #include <pichi/api/vos.hpp>

Property changes on: head/net/pichi/files/patch-test_utils.hpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/pichi/files/patch-cmake_Configure.cmake
===================================================================
--- head/net/pichi/files/patch-cmake_Configure.cmake	(nonexistent)
+++ head/net/pichi/files/patch-cmake_Configure.cmake	(revision 548461)
@@ -0,0 +1,26 @@
+--- cmake/Configure.cmake.orig	1970-01-01 00:00:00 UTC
++++ cmake/Configure.cmake
+@@ -104,6 +104,14 @@ else ()
+   set(DEPRECATED_RFC2818_CLASS OFF)
+ endif ()
+ 
++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
++  CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "11.0.0")
++  # From clang 11.0.0, using std::allocator<void> triggers -Wdeprecated-declarations
++   set(DEPRECATED_ALLOCATOR_VOID ON)
++else ()
++  set(DEPRECATED_ALLOCATOR_VOID OFF)
++endif ()
++
+ # TODO check_cxx_compiler_flag command always gets failed when generating for iOS
+ if (IOS)
+   set(DISABLE_SHORTEN_64_TO_32_WARNING ON)
+@@ -125,6 +133,7 @@ if (BUILD_SERVER)
+   check_function_exists("close" HAS_CLOSE)
+ endif ()
+ 
+-configure_file(${CMAKE_SOURCE_DIR}/include/pichi/config.hpp.in ${CMAKE_BINARY_DIR}/include/pichi/config.hpp)
++configure_file(${CMAKE_SOURCE_DIR}/include/pichi/config.hpp.in
++  ${CMAKE_BINARY_DIR}/include/pichi/config.hpp)
+ 
+ message(STATUS "Generating config.hpp - done")

Property changes on: head/net/pichi/files/patch-cmake_Configure.cmake
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/pichi/files/patch-include_pichi_config.hpp.in
===================================================================
--- head/net/pichi/files/patch-include_pichi_config.hpp.in	(revision 548460)
+++ head/net/pichi/files/patch-include_pichi_config.hpp.in	(revision 548461)
@@ -1,18 +1,63 @@
 --- include/pichi/config.hpp.in.orig	1970-01-01 00:00:00 UTC
 +++ include/pichi/config.hpp.in
-@@ -42,6 +42,15 @@
+@@ -25,7 +25,7 @@
+ #pragma clang diagnostic ignored "-Wreturn-std-move"
+ #include <boost/asio/ip/basic_resolver.hpp>
+ #pragma clang diagnostic pop
+-#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__
++#endif  // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__
+ 
+ #cmakedefine DISABLE_SHORTEN_64_TO_32_WARNING
+ #if defined(DISABLE_SHORTEN_64_TO_32_WARNING) && defined(__clang__)
+@@ -33,7 +33,7 @@
+ #pragma clang diagnostic ignored "-Wshorten-64-to-32"
+ #include <boost/asio/basic_socket.hpp>
+ #pragma clang diagnostic pop
+-#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__
++#endif  // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__
+ 
+ #cmakedefine DISABLE_C4702_FOR_BEAST_FIELDS
+ #if defined(DISABLE_C4702_FOR_BEAST_FIELDS) && defined(_MSC_VER)
+@@ -41,7 +41,7 @@
+ #pragma warning(disable : 4702)
+ #include <boost/beast/http/fields.hpp>
  #pragma warning(pop)
- #endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
+-#endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
++#endif  // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
  
-+#ifdef __clang__
-+#if !__has_feature(c_atomic)
+ #ifdef __clang__
+ #if !__has_feature(c_atomic)
+@@ -49,18 +49,28 @@
+ #pragma clang diagnostic ignored "-Wc11-extensions"
+ #include <boost/smart_ptr/detail/sp_counted_base_clang.hpp>
+ #pragma clang diagnostic pop
+-#endif // !__has_feature(c_atomic)
+-#endif // __clang__
++#endif  // !__has_feature(c_atomic)
++#endif  // __clang__
+ 
++#cmakedefine DEPRECATED_ALLOCATOR_VOID
++#if defined(DEPRECATED_ALLOCATOR_VOID) && defined(__clang__)
 +#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wc11-extensions"
-+#include <boost/smart_ptr/detail/sp_counted_base_clang.hpp>
++#pragma clang diagnostic ignored "-Wdeprecated-declarations"
++#include <boost/asio/associated_allocator.hpp>
++#include <boost/asio/impl/executor.hpp>
++#include <boost/beast/core/async_base.hpp>
 +#pragma clang diagnostic pop
-+#endif // !__has_feature(c_atomic)
-+#endif // __clang__
++#endif  // DEPRECATED_ALLOCATOR_VOID && __clang__
 +
  #cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
  
  #ifdef CMAKE_INSTALL_PREFIX
+ #define PICHI_PREFIX CMAKE_INSTALL_PREFIX
+-#else // CMAKE_INSTALL_PREFIX
++#else  // CMAKE_INSTALL_PREFIX
+ #error "CMAKE_INSTALL_PREFIX not defined"
+-#endif // CMAKE_INSTALL_PREFIX
++#endif  // CMAKE_INSTALL_PREFIX
+ 
+ #cmakedefine ENABLE_TLS
+ #cmakedefine BUILD_TEST
+ 
+-#endif // PICHI_CONFIG_H
++#endif  // PICHI_CONFIG_H
Index: head/net/pichi/files/patch-src_api_egress__manager.cpp
===================================================================
--- head/net/pichi/files/patch-src_api_egress__manager.cpp	(nonexistent)
+++ head/net/pichi/files/patch-src_api_egress__manager.cpp	(revision 548461)
@@ -0,0 +1,26 @@
+--- src/api/egress_manager.cpp.orig	1970-01-01 00:00:00 UTC
++++ src/api/egress_manager.cpp
+@@ -1,5 +1,6 @@
+-#include <pichi/api/egress_manager.hpp>
+ #include <pichi/config.hpp>
++// Include config.hpp first
++#include <pichi/api/egress_manager.hpp>
+ 
+ using namespace std;
+ 
+@@ -9,7 +10,7 @@ void EgressManager::update(string const& name, EgressV
+ {
+ #ifndef ENABLE_TLS
+   assertFalse(vo.tls_.has_value() && *vo.tls_, PichiError::SEMANTIC_ERROR, "TLS not supported");
+-#endif // ENABLE_TLS
++#endif  // ENABLE_TLS
+   c_[name] = move(vo);
+ }
+ 
+@@ -25,4 +26,4 @@ EgressManager::ConstIterator EgressManager::end() cons
+ 
+ EgressManager::ConstIterator EgressManager::find(string_view name) const { return c_.find(name); }
+ 
+-} // namespace pichi::api
+\ No newline at end of file
++}  // namespace pichi::api

Property changes on: head/net/pichi/files/patch-src_api_egress__manager.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/pichi/files/patch-src_api_vos.cpp
===================================================================
--- head/net/pichi/files/patch-src_api_vos.cpp	(nonexistent)
+++ head/net/pichi/files/patch-src_api_vos.cpp	(revision 548461)
@@ -0,0 +1,65 @@
+--- src/api/vos.cpp.orig	1970-01-01 00:00:00 UTC
++++ src/api/vos.cpp
+@@ -1,3 +1,5 @@
++#include <pichi/config.hpp>
++// Include config.hpp first
+ #include <numeric>
+ #include <pichi/api/vos.hpp>
+ #include <pichi/common.hpp>
+@@ -57,7 +59,7 @@ static decltype(auto) keyFile_ = "key_file";
+ static decltype(auto) destinations_ = "destinations";
+ static decltype(auto) balance_ = "balance";
+ 
+-} // namespace IngressVOKey
++}  // namespace IngressVOKey
+ 
+ namespace EgressVOKey {
+ 
+@@ -73,7 +75,7 @@ static decltype(auto) tls_ = "tls";
+ static decltype(auto) insecure_ = "insecure";
+ static decltype(auto) caFile_ = "ca_file";
+ 
+-} // namespace EgressVOKey
++}  // namespace EgressVOKey
+ 
+ namespace RuleVOKey {
+ 
+@@ -84,20 +86,20 @@ static decltype(auto) pattern_ = "pattern";
+ static decltype(auto) domain_ = "domain";
+ static decltype(auto) country_ = "country";
+ 
+-} // namespace RuleVOKey
++}  // namespace RuleVOKey
+ 
+ namespace RouteVOKey {
+ 
+ static decltype(auto) default_ = "default";
+ static decltype(auto) rules_ = "rules";
+ 
+-} // namespace RouteVOKey
++}  // namespace RouteVOKey
+ 
+ namespace ErrorVOKey {
+ 
+ static decltype(auto) message_ = "message";
+ 
+-} // namespace ErrorVOKey
++}  // namespace ErrorVOKey
+ 
+ namespace msg {
+ 
+@@ -129,7 +131,7 @@ static auto const TOO_LONG_NAME_PASSWORD = "Name or pa
+ static auto const MISSING_DESTINATIONS_FIELD = "Missiong destinations field"sv;
+ static auto const MISSING_BALANCE_FIELD = "Missiong balance field"sv;
+ 
+-} // namespace msg
++}  // namespace msg
+ 
+ static DelayMode parseDelayMode(json::Value const& v)
+ {
+@@ -683,4 +685,4 @@ template <> RouteVO parse(json::Value const& v)
+   return rvo;
+ }
+ 
+-} // namespace pichi::api
++}  // namespace pichi::api

Property changes on: head/net/pichi/files/patch-src_api_vos.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/pichi/files/patch-src_net_spawn.cpp
===================================================================
--- head/net/pichi/files/patch-src_net_spawn.cpp	(nonexistent)
+++ head/net/pichi/files/patch-src_net_spawn.cpp	(revision 548461)
@@ -0,0 +1,14 @@
+--- src/net/spawn.cpp.orig	1970-01-01 00:00:00 UTC
++++ src/net/spawn.cpp
+@@ -1,3 +1,5 @@
++#include <pichi/config.hpp>
++// Include config.hpp first
+ #include <boost/beast/http/error.hpp>
+ #include <iostream>
+ #include <pichi/exception.hpp>
+@@ -28,4 +30,4 @@ void logException(std::exception_ptr eptr) noexcept
+ 
+ void stubHandler(std::exception_ptr, asio::yield_context) noexcept {}
+ 
+-} // namespace pichi::net
++}  // namespace pichi::net

Property changes on: head/net/pichi/files/patch-src_net_spawn.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/pichi/pkg-plist
===================================================================
--- head/net/pichi/pkg-plist	(revision 548460)
+++ head/net/pichi/pkg-plist	(revision 548461)
@@ -1,43 +1,43 @@
 bin/pichi
 %%ETCDIR%%/geo.mmdb
 @sample %%ETCDIR%%/pichi.json.sample
 %%NO_STATIC%%lib/libpichi.so.%%DISTVERSION%%
 %%NO_STATIC%%lib/libpichi.so
 %%STATIC%%%%DEVEL%%lib/libpichi.a
 %%DEVEL%%include/boost/asio/spawn2.hpp
 %%DEVEL%%include/pichi/api/balancer.hpp
 %%DEVEL%%include/pichi/api/egress_manager.hpp
 %%DEVEL%%include/pichi/api/ingress_holder.hpp
 %%DEVEL%%include/pichi/api/ingress_manager.hpp
 %%DEVEL%%include/pichi/api/iterator.hpp
 %%DEVEL%%include/pichi/api/rest.hpp
 %%DEVEL%%include/pichi/api/router.hpp
 %%DEVEL%%include/pichi/api/server.hpp
 %%DEVEL%%include/pichi/api/session.hpp
 %%DEVEL%%include/pichi/api/vos.hpp
 %%DEVEL%%include/pichi/asserts.hpp
 %%DEVEL%%include/pichi/buffer.hpp
 %%DEVEL%%include/pichi/common.hpp
 %%DEVEL%%include/pichi/config.hpp
 %%DEVEL%%include/pichi/crypto/aead.hpp
 %%DEVEL%%include/pichi/crypto/base64.hpp
 %%DEVEL%%include/pichi/crypto/hash.hpp
 %%DEVEL%%include/pichi/crypto/key.hpp
 %%DEVEL%%include/pichi/crypto/method.hpp
 %%DEVEL%%include/pichi/crypto/stream.hpp
 %%DEVEL%%include/pichi/exception.hpp
 %%DEVEL%%include/pichi/net/adapter.hpp
 %%DEVEL%%include/pichi/net/asio.hpp
 %%DEVEL%%include/pichi/net/common.hpp
 %%DEVEL%%include/pichi/net/direct.hpp
 %%DEVEL%%include/pichi/net/helpers.hpp
 %%DEVEL%%include/pichi/net/http.hpp
 %%DEVEL%%include/pichi/net/reject.hpp
 %%DEVEL%%include/pichi/net/socks5.hpp
 %%DEVEL%%include/pichi/net/spawn.hpp
 %%DEVEL%%include/pichi/net/ssaead.hpp
 %%DEVEL%%include/pichi/net/ssstream.hpp
+%%DEVEL%%include/pichi/net/stream.hpp
 %%DEVEL%%include/pichi/net/tunnel.hpp
-%%DEVEL%%include/pichi/test/socket.hpp
 %%DEVEL%%include/pichi/uri.hpp
 %%DEVEL%%include/pichi.h