Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 55141 invoked from network); 18 Dec 2007 03:47:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Dec 2007 03:47:12 -0000 Received: (qmail 25602 invoked by uid 500); 18 Dec 2007 03:47:01 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 25528 invoked by uid 500); 18 Dec 2007 03:47:01 -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 25517 invoked by uid 99); 18 Dec 2007 03:47:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Dec 2007 19:47:01 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2007 03:46:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 945451A9844; Mon, 17 Dec 2007 19:46:50 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r605073 - in /httpd/httpd/branches/2.2.x: modules/http/http_etag.c support/ab.c Date: Tue, 18 Dec 2007 03:46:50 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071218034650.945451A9844@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Mon Dec 17 19:46:48 2007 New Revision: 605073 URL: http://svn.apache.org/viewvc?rev=605073&view=rev Log: Two type mismatch fixes previously committed to trunk\ and forgotten from backports Modified: httpd/httpd/branches/2.2.x/modules/http/http_etag.c httpd/httpd/branches/2.2.x/support/ab.c Modified: httpd/httpd/branches/2.2.x/modules/http/http_etag.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/http/http_etag.c?rev=605073&r1=605072&r2=605073&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/modules/http/http_etag.c (original) +++ httpd/httpd/branches/2.2.x/modules/http/http_etag.c Mon Dec 17 19:46:48 2007 @@ -37,7 +37,8 @@ int printing = 0; int shift = sizeof(apr_uint64_t) * 8 - 4; do { - unsigned short next_digit = ((u >> shift) & (apr_uint64_t)0xf); + unsigned short next_digit = (unsigned short) + ((u >> shift) & (apr_uint64_t)0xf); if (next_digit) { *next++ = HEX_DIGITS[next_digit]; printing = 1; Modified: httpd/httpd/branches/2.2.x/support/ab.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/ab.c?rev=605073&r1=605072&r2=605073&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/support/ab.c (original) +++ httpd/httpd/branches/2.2.x/support/ab.c Mon Dec 17 19:46:48 2007 @@ -1147,7 +1147,7 @@ SSL_set_connect_state(c->ssl); if (verbosity >= 4) { BIO_set_callback(bio, ssl_print_cb); - BIO_set_callback_arg(bio, bio_err); + BIO_set_callback_arg(bio, (void *)bio_err); } } else { c->ssl = NULL;