httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Guenter Knauf <fua...@apache.org>
Subject Re: time for 1.3.40 and 2.2.7 ?
Date Thu, 20 Dec 2007 09:59:22 GMT
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.



Mime
View raw message