Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 35196 invoked from network); 20 Dec 2007 09:59:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Dec 2007 09:59:37 -0000 Received: (qmail 71441 invoked by uid 500); 20 Dec 2007 09:59:23 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 71378 invoked by uid 500); 20 Dec 2007 09:59:23 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 71367 invoked by uid 99); 20 Dec 2007 09:59:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Dec 2007 01:59:23 -0800 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [194.242.35.95] (HELO dns-factory.at) (194.242.35.95) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Dec 2007 09:58:56 +0000 Received: from WSLT03 apache@gknw.net [172.17.100.16] by dns-factory.at with NetMail SMTP Agent $Revision: 8582 $ on Novell NetWare; Thu, 20 Dec 2007 10:58:57 +0100 Date: Thu, 20 Dec 2007 10:59:22 +0100 From: Guenter Knauf To: dev@httpd.apache.org Subject: Re: time for 1.3.40 and 2.2.7 ? Message-ID: References: <78F17090-10C4-43F9-8DC3-3FCF7CC74638@jaguNET.com> <3mVETQBAr7qi5REYRjtsDYPpWFSd9SVgeX6aU4Ntfbd@akmail> <4769D841.8050509@rowe-clan.net> X-Mailer: AK-Mail 4.01 [German] (registered, single user license) Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org Hi, >> any chance we can get this simple patch in to correct a type mismatch >> which bothers me all the time when compiling with OpenSSL 0.9.8 on >> NetWare? >> http://people.apache.org/~fuankg/diffs/ssl_scache_shmht.c.diff >> >> --- ssl_scache_shmht.c.orig Wed Jul 12 09:40:56 2006 >> +++ ssl_scache_shmht.c Sun Nov 25 17:32:58 2007 >> @@ -198,7 +198,7 @@ >> SSLModConfigRec *mc = myModConfig(s); >> void *vp; >> SSL_SESSION *sess = NULL; >> - UCHAR *ucpData; >> + MODSSL_D2I_SSL_SESSION_CONST UCHAR *ucpData; >> int nData; >> time_t expiry; >> time_t now; >> @@ -223,7 +223,7 @@ >> return NULL; >> } >> memcpy(&expiry, vp, sizeof(time_t)); >> - memcpy(ucpData, (char *)vp+sizeof(time_t), nData); >> + memcpy((void *)ucpData, (char *)vp+sizeof(time_t), nData); >> ssl_mutex_off(s); >> >> /* make sure the stuff is still not expired */ > Are you certain (void *)ucpData cast is actually useful? I was pretty > certain memcpy is more tolerant than that. unfortunately not - our NetWare compiler breaks without. The only alternative patch would be: --- ssl_scache_shmht.c.orig Wed Jul 12 09:40:56 2006 +++ ssl_scache_shmht.c Sun Nov 25 17:01:26 2007 @@ -234,7 +234,8 @@ } /* unstreamed SSL_SESSION */ - sess = d2i_SSL_SESSION(NULL, &ucpData, nData); + sess = d2i_SSL_SESSION(NULL, + (MODSSL_D2I_SSL_SESSION_CONST UCHAR **)&ucpData, nData); return sess; } > About the rest of it, +1 thanks. Guenter.