Attachment 189215 Details for Bug 224123 – Upstream fix

[patch] Upstream fix

pokerth.diff (text/plain), 2.54 KB, created by Guido Falsi on 2017-12-30 09:53:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2017-12-30 09:53:28 UTC

Size: 2.54 KB

patch

obsolete

>Index: files/patch-src_net_common_clientthread.cpp
>===================================================================
>--- files/patch-src_net_common_clientthread.cpp	(nonexistent)
>+++ files/patch-src_net_common_clientthread.cpp	(working copy)
>@@ -0,0 +1,15 @@
>+--- src/net/common/clientthread.cpp.orig	2017-08-16 12:24:03 UTC
>++++ src/net/common/clientthread.cpp
>+@@ -993,8 +993,12 @@ ClientThread::CreateContextSession()
>+ 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6()));
>+ 		else
>+ 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4()));
>++#if BOOST_VERSION < 106600
>+ 		boost::asio::socket_base::non_blocking_io command(true);
>+ 		newSock->io_control(command);
>++#else
>++		newSock->non_blocking(true);
>++#endif
>+ 		newSock->set_option(tcp::no_delay(true));
>+ 		newSock->set_option(boost::asio::socket_base::keep_alive(true));
>+ 
>
>Property changes on: files/patch-src_net_common_clientthread.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: files/patch-src_net_serveraccepthelper.h
>===================================================================
>--- files/patch-src_net_serveraccepthelper.h	(nonexistent)
>+++ files/patch-src_net_serveraccepthelper.h	(working copy)
>@@ -0,0 +1,15 @@
>+--- src/net/serveraccepthelper.h.orig	2017-08-16 12:24:03 UTC
>++++ src/net/serveraccepthelper.h
>+@@ -122,8 +122,12 @@ class ServerAcceptHelper : public ServerAcceptInterfac
>+ 					  const boost::system::error_code &error)
>+ 	{
>+ 		if (!error) {
>++#if BOOST_VERSION < 106600
>+ 			boost::asio::socket_base::non_blocking_io command(true);
>+ 			acceptedSocket->io_control(command);
>++#else
>++			acceptedSocket->non_blocking(true);
>++#endif
>+ 			acceptedSocket->set_option(typename P::no_delay(true));
>+ 			acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));
>+ 			boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));
>
>Property changes on: files/patch-src_net_serveraccepthelper.h
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 224123: 188819 | 189215