SHA256
1
0
forked from pool/mono-core

Accepting request 535603 from home:Warhammer40k:Mono:Factory

Fix bxc#57918 - System.Net.Sockets.EndSend returns incorrect value

OBS-URL: https://build.opensuse.org/request/show/535603
OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=189
This commit is contained in:
Ismail Dönmez 2017-10-21 07:33:50 +00:00 committed by Git OBS Bridge
parent f9262ba828
commit e02265dea3
3 changed files with 42 additions and 0 deletions

33
bug-57918.patch Normal file
View File

@ -0,0 +1,33 @@
From b2250d8ecf56f71ea4c2c7271ac138d1f0196136 Mon Sep 17 00:00:00 2001
From: Katelyn Gadd <kg@luminance.org>
Date: Mon, 11 Sep 2017 17:26:04 -0700
Subject: [PATCH] Fix bug 57918: Async Socket reads that need to perform
multiple underlying read operations fail to return a correct total # of bytes
read
---
mcs/class/System/System.Net.Sockets/Socket.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs
index d19756b6c300..3821602fbbda 100644
--- a/mcs/class/System/System.Net.Sockets/Socket.cs
+++ b/mcs/class/System/System.Net.Sockets/Socket.cs
@@ -1902,7 +1902,7 @@ static void BeginSendCallback (SocketAsyncResult sockares, int sent_so_far)
sockares.Size -= total;
if (sockares.socket.CleanedUp) {
- sockares.Complete (total);
+ sockares.Complete (sent_so_far);
return;
}
@@ -1914,7 +1914,7 @@ static void BeginSendCallback (SocketAsyncResult sockares, int sent_so_far)
sockares.Total = sent_so_far;
}
- sockares.Complete (total);
+ sockares.Complete (sent_so_far);
}
[CLSCompliant (false)]

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 20 00:00:00 UTC 2017 - fwdsbs.to.11df@xoxy.net
- Add bug-57918.patch:
* Fix bxc#57918 - System.Net.Sockets.EndSend returns incorrect value
-------------------------------------------------------------------
Tue Oct 17 00:00:00 UTC 2017 - fwdsbs.to.11df@xoxy.net

View File

@ -56,6 +56,8 @@ ExcludeArch: ppc
Patch1: ucontext.patch
# PATCH-FIX-UPSTREAM search provides (for RPM-packaging) not only for GAC dir, but also for "Facades" and "4.5" mono-libdirs
Patch2: provides-facades.patch
# PATCH-FIX-UPSTREAM System.Net.Sockets.EndSend returns incorrect value. See https://bugzilla.xamarin.com/show_bug.cgi?id=57918 for more information
Patch3: bug-57918.patch
# PATCH-FIX-OPENSUSE remove checks for libmono in mono-find-provides and mono-find-requires scripts
Patch14: find-deps-fix.patch
# PATCH-FIX-OPENSUSE revert Microsoft.Build.Tasks library to use old mcs compiler. This will make xbuild to use old mcs instead of csc - patch is used when roslyn is unavailable for current platform (big-endian systems).
@ -205,6 +207,7 @@ technologies that have been submitted to the ECMA for standardization.
%setup -q -n mono-%{version}.%{version_suffix}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch14 -p1
%patch16 -p1
%if %roslyn == no