Merge pull request #1732 from PurpleI2P/patch-1

Set of updates

contrib/webconsole/style.css

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2021, The PurpleI2P Project
+ * Copyright (c) 2021-2022, The PurpleI2P Project
  *
  * This file is part of Purple i2pd project and licensed under BSD3
  *

daemon/HTTPServer.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -1391,7 +1391,13 @@ namespace http {
 	void HTTPServer::Stop ()
 	{
 		m_IsRunning = false;
+
+		boost::system::error_code ec;
+		m_Acceptor.cancel(ec);
+		if (ec)
+			LogPrint (eLogDebug, "HTTPServer: Error while cancelling operations on acceptor: ", ec.message ());
 		m_Acceptor.close();
+
 		m_Service.stop ();
 		if (m_Thread)
 		{
@@ -1427,15 +1433,13 @@ namespace http {
 	void HTTPServer::HandleAccept(const boost::system::error_code& ecode,
 		std::shared_ptr<boost::asio::ip::tcp::socket> newSocket)
 	{
-		if (ecode)
+		if (!ecode)
+			CreateConnection(newSocket);
+		else
 		{
 			if(newSocket) newSocket->close();
-			LogPrint(eLogError, "HTTP Server: Error handling accept ", ecode.message());
-			if(ecode != boost::asio::error::operation_aborted)
-				Accept();
-			return;
+			LogPrint(eLogError, "HTTP Server: Error handling accept: ", ecode.message());
 		}
-		CreateConnection(newSocket);
 		Accept ();
 	}
 

daemon/HTTPServerResources.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

i18n/I18N.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021, The PurpleI2P Project
+* Copyright (c) 2021-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

i18n/Uzbek.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021, The PurpleI2P Project
+* Copyright (c) 2021-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd/Destination.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd/I2PEndian.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd/I2PEndian.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd/Reseed.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd/SSU2.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2022, The PurpleI2P Project
+* Copyright (c) 2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd/SSU2.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2022, The PurpleI2P Project
+* Copyright (c) 2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd/util.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd/version.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd_wrapper/api.go

@@ -1,7 +1,7 @@
 package api
 
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2021-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd_wrapper/capi.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2021-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

libi2pd_wrapper/capi.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2021-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *