Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 94853 invoked from network); 12 Jan 2006 19:14:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jan 2006 19:14:54 -0000 Received: (qmail 89043 invoked by uid 500); 12 Jan 2006 19:14:53 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 89003 invoked by uid 500); 12 Jan 2006 19:14:53 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 88992 invoked by uid 99); 12 Jan 2006 19:14:52 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jan 2006 11:14:52 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 12 Jan 2006 11:14:52 -0800 Received: (qmail 94700 invoked by uid 65534); 12 Jan 2006 19:14:32 -0000 Message-ID: <20060112191432.94699.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r368443 - /httpd/httpd/trunk/server/protocol.c Date: Thu, 12 Jan 2006 19:14:31 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: wrowe Date: Thu Jan 12 11:14:28 2006 New Revision: 368443 URL: http://svn.apache.org/viewcvs?rev=368443&view=rev Log: An unambigous cast, if limit is <0 it's unlimited. Modified: httpd/httpd/trunk/server/protocol.c Modified: httpd/httpd/trunk/server/protocol.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/protocol.c?rev=368443&r1=368442&r2=368443&view=diff ============================================================================== --- httpd/httpd/trunk/server/protocol.c (original) +++ httpd/httpd/trunk/server/protocol.c Thu Jan 12 11:14:28 2006 @@ -704,8 +704,9 @@ else { apr_size_t pending_len = strlen(r->pending_header_line); apr_size_t fold_len = strlen(line); - if (pending_len + fold_len > - r->server->limit_req_fieldsize) { + if ((r->server->limit_req_fieldsize > 0) + && (pending_len + fold_len > + (apr_size_t) r->server->limit_req_fieldsize)) { /* CVE-2004-0942 */ r->status = HTTP_BAD_REQUEST; return APR_ENOSPC;