diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
| commit | 03d66a659ae5011ca0d5279cafb1596a982a06d8 (patch) | |
| tree | b8c8cd52f300381a02e32bdea5d4eae6f30262fc /www/chromium/files/patch-net_socket_udp__socket__posix.cc | |
| parent | Update to 1.37.0 (diff) | |
www/chromium: update to 78.0.3904.87
Submitted by: Matthias Wolf via github
MFH: 2019Q4
Diffstat (limited to 'www/chromium/files/patch-net_socket_udp__socket__posix.cc')
| -rw-r--r-- | www/chromium/files/patch-net_socket_udp__socket__posix.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index 58ca2cbcaf12..c0cfba258179 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,4 +1,4 @@ ---- net/socket/udp_socket_posix.cc.orig 2019-06-04 18:55:27 UTC +--- net/socket/udp_socket_posix.cc.orig 2019-09-09 21:55:22 UTC +++ net/socket/udp_socket_posix.cc @@ -69,7 +69,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE const base::TimeDelta kActivityMonitorMsThreshold = @@ -18,7 +18,7 @@ #if defined(OS_MACOSX) && !defined(OS_IOS) -@@ -645,13 +645,13 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -644,13 +644,13 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -34,7 +34,7 @@ } int UDPSocketPosix::AllowAddressReuse() { -@@ -666,17 +666,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -665,17 +665,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -57,7 +57,7 @@ rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value)); return rv == 0 ? OK : MapSystemError(errno); -@@ -938,7 +941,7 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -935,7 +938,7 @@ int UDPSocketPosix::SetMulticastOptions() { if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { @@ -66,7 +66,7 @@ ip_mreq mreq = {}; int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, &mreq.imr_interface.s_addr); -@@ -950,7 +953,11 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -947,7 +950,11 @@ int UDPSocketPosix::SetMulticastOptions() { mreq.imr_address.s_addr = htonl(INADDR_ANY); #endif // !defined(OS_MACOSX) int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF, @@ -78,7 +78,7 @@ if (rv) return MapSystemError(errno); break; -@@ -1012,7 +1019,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a +@@ -1009,7 +1016,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; @@ -87,7 +87,7 @@ ip_mreq mreq = {}; int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, &mreq.imr_interface.s_addr); -@@ -1060,9 +1067,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ +@@ -1057,9 +1064,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ case IPAddress::kIPv4AddressSize: { if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; |