Commit 3978dfbc authored by Guenter Knauf's avatar Guenter Knauf
Browse files

fixed type mismatch between OpenSSL 0.9.7 <-> 0.9.8 and later. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@607132 13f79535-47bb-0310-9956-ffa450edef68
parent 903288bd

modules/ssl/ssl_scache_shmht.c

+2 −2
Changes for modules/ssl/ssl_scache_shmht.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ SSL_SESSION *ssl_scache_shmht_retrieve(server_rec *s, UCHAR *id, int idlen) 
    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 @@ SSL_SESSION *ssl_scache_shmht_retrieve(server_rec *s, UCHAR *id, int idlen) 
        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 */