From owner-cvs-all@FreeBSD.ORG  Sun Nov 12 20:57:01 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A6AEE16A403;
	Sun, 12 Nov 2006 20:57:01 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 75ED043D49;
	Sun, 12 Nov 2006 20:57:01 +0000 (GMT)
	(envelope-from andre@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kACKv1cO096083;
	Sun, 12 Nov 2006 20:57:01 GMT
	(envelope-from andre@repoman.freebsd.org)
Received: (from andre@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kACKv18j096081;
	Sun, 12 Nov 2006 20:57:01 GMT (envelope-from andre)
Message-Id: <200611122057.kACKv18j096081@repoman.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Sun, 12 Nov 2006 20:57:00 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/kern uipc_syscalls.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Nov 2006 20:57:01 -0000

andre       2006-11-12 20:57:00 UTC

  FreeBSD src repository

  Modified files:
    sys/kern             uipc_syscalls.c 
  Log:
  In kern_sendfile() fix the calculation of sbytes (the total number of bytes
  written to the socket).  The rewrite in revision 1.240 got confused by the
  FreeBSD 4.x bug compatibility code.
  
  For some reason lighttpd, that was used for testing the new sendfile code,
  was not affected by the problem but apache and others using headers/trailers
  in the sendfile call received incorrect sbytes values after return from non-
  blocking sockets.  This then lead to restarts with wrong offsets and thus
  mixed up file contents when the socket was writeable again.  All programs
  not using headers/trailers, like ftpd, were not affected by the bug.
  
  Reported by:    Pawel Worach <pawel.worach-at-gmail.com>
  Tested by:      Pawel Worach <pawel.worach-at-gmail.com>
  
  Revision  Changes    Path
  1.245     +19 -23    src/sys/kern/uipc_syscalls.c