Page MenuHomeFreeBSD
Files F174140260

D25838.diff
No OneTemporary
Actions

D25838.diff
View Options

Index: head/sys/kern/uipc_socket.c
===================================================================
--- head/sys/kern/uipc_socket.c
+++ head/sys/kern/uipc_socket.c
@@ -1965,12 +1965,17 @@
}
SOCKBUF_LOCK_ASSERT(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
- if (m == NULL && so->so_rcv.sb_tlsdcc == 0 &&
+ if (m != NULL)
+ goto dontblock;
+#ifdef KERN_TLS
+ else if (so->so_rcv.sb_tlsdcc == 0 &&
so->so_rcv.sb_tlscc == 0) {
+#else
+ else {
+#endif
SOCKBUF_UNLOCK(&so->so_rcv);
goto release;
- } else
- goto dontblock;
+ }
}
for (; m != NULL; m = m->m_next)
if (m->m_type == MT_OOBDATA || (m->m_flags & M_EOR)) {

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 1, 9:10 PM (15 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40041820
Default Alt Text
D25838.diff (684 B)

Event Timeline