From owner-cvs-src@FreeBSD.ORG Sat Feb 19 20:56:08 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A93B16A4CE; Sat, 19 Feb 2005 20:56:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5221D43D31; Sat, 19 Feb 2005 20:56:08 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1JKu8v9062202; Sat, 19 Feb 2005 20:56:08 GMT (envelope-from glebius@repoman.freebsd.org) Received: (from glebius@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1JKu8qR062201; Sat, 19 Feb 2005 20:56:08 GMT (envelope-from glebius) Message-Id: <200502192056.j1JKu8qR062201@repoman.freebsd.org> From: Gleb Smirnoff Date: Sat, 19 Feb 2005 20:56:08 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5 Subject: cvs commit: src/sys/kern uipc_socket.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Feb 2005 20:56:08 -0000 glebius 2005-02-19 20:56:08 UTC FreeBSD src repository Modified files: (Branch: RELENG_5) sys/kern uipc_socket.c Log: Apply a workaround for problem fixed in sys/socketvar.h rev. 1.137. We can't MFC socketvar.h since it will break ABI between kernel and several modules. This workaround saves sb_state in local variable and restores it after bzero(). Original commit log of socketvar.h and problem description: Move sb_state to the beginning of structure, above sb_startzero member. sb_state shouldn't be erased, when socket buffer is flushed by sorflush(). When sb_state was bzero'ed, a recently set SBS_CANTRCVMORE flag was cleared. If a socket was shutdown(SHUT_RD), a subsequent read() would block on it. Reported by: Ed Maste, Gerrit Nagelhout Reviewed by: rwatson Revision Changes Path 1.208.2.11 +8 -0 src/sys/kern/uipc_socket.c