Commit 46395f6e authored by Joe Orton's avatar Joe Orton
Browse files

* include/ap_socache.h: Use C++ safety wrappers, and rename ->delete 

  to ->remove since the former is a C++ reserved word.

* modules/ssl/ssl_scache.c (ssl_scache_remove): Update accordingly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724745 13f79535-47bb-0310-9956-ffa450edef68
parent 2eb5b4ad

include/ap_socache.h

+10 −2
Original line number Diff line number Diff line
@@ -30,7 +30,11 @@ 
#include "ap_provider.h"

#include "apr_pools.h"



/** If this flag is set, the store/retrieve/delete/status interfaces

#ifdef __cplusplus

extern "C" {

#endif



/** If this flag is set, the store/retrieve/remove/status interfaces

 * of the provider are NOT safe to be called concurrently from

 * multiple processes or threads, and an external global mutex must be

 * used to serialize access to the provider. */
@@ -141,7 +145,7 @@ typedef struct ap_socache_provider_t { 
     * @param idlen Length of id blob

     * @param pool Pool for temporary allocations.

     */

    void (*delete)(ap_socache_instance_t *instance, server_rec *s,

    void (*remove)(ap_socache_instance_t *instance, server_rec *s,

                   const unsigned char *id, unsigned int idlen,

                   apr_pool_t *pool);
@@ -163,5 +167,9 @@ typedef struct ap_socache_provider_t { 
/** Default provider name. */

#define AP_SOCACHE_DEFAULT_PROVIDER "default"



#ifdef __cplusplus

}

#endif



#endif /* AP_SOCACHE_H */

/** @} */

modules/ssl/ssl_scache.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ void ssl_scache_remove(server_rec *s, UCHAR *id, int idlen, 
        ssl_mutex_on(s);

    }



    mc->sesscache->delete(mc->sesscache_context, s, id, idlen, p);

    mc->sesscache->remove(mc->sesscache_context, s, id, idlen, p);



    if (mc->sesscache->flags & AP_SOCACHE_FLAG_NOTMPSAFE) {

        ssl_mutex_off(s);