You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2007/12/27 23:30:46 UTC
svn commit: r607132 -
/httpd/httpd/branches/2.0.x/modules/ssl/ssl_scache_shmht.c
Author: fuankg
Date: Thu Dec 27 14:30:46 2007
New Revision: 607132
URL: http://svn.apache.org/viewvc?rev=607132&view=rev
Log:
fixed type mismatch between OpenSSL 0.9.7 <-> 0.9.8 and later.
Modified:
httpd/httpd/branches/2.0.x/modules/ssl/ssl_scache_shmht.c
Modified: httpd/httpd/branches/2.0.x/modules/ssl/ssl_scache_shmht.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/modules/ssl/ssl_scache_shmht.c?rev=607132&r1=607131&r2=607132&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/ssl/ssl_scache_shmht.c (original)
+++ httpd/httpd/branches/2.0.x/modules/ssl/ssl_scache_shmht.c Thu Dec 27 14:30:46 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 */