Commit 93b56b10 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

You don't export registered entry points

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664217 13f79535-47bb-0310-9956-ffa450edef68
parent 5395b3f7
Loading
Loading
Loading
Loading
+4 −7
Changes for modules/session/mod_session_cookie.c: 4 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ typedef struct {
    int remove_set;
} session_cookie_dir_conf;

AP_DECLARE(int) ap_session_cookie_save(request_rec * r, session_rec * z);
AP_DECLARE(int) ap_session_cookie_load(request_rec * r, session_rec ** z);

/**
 * Set the cookie and embed the session within it.
 *
@@ -58,7 +55,7 @@ AP_DECLARE(int) ap_session_cookie_load(request_rec * r, session_rec ** z);
 * @param r The request pointer.
 * @param z A pointer to where the session will be written.
 */
AP_DECLARE(int) ap_session_cookie_save(request_rec * r, session_rec * z)
static int session_cookie_save(request_rec * r, session_rec * z)
{

    session_cookie_dir_conf *conf = ap_get_module_config(r->per_dir_config,
@@ -107,7 +104,7 @@ AP_DECLARE(int) ap_session_cookie_save(request_rec * r, session_rec * z)
 *
 * On success, this returns APR_SUCCESS.
 */
AP_DECLARE(int) ap_session_cookie_load(request_rec * r, session_rec ** z)
static int session_cookie_load(request_rec * r, session_rec ** z)
{

    session_cookie_dir_conf *conf = ap_get_module_config(r->per_dir_config,
@@ -262,8 +259,8 @@ static const command_rec session_cookie_cmds[] =

static void register_hooks(apr_pool_t * p)
{
    ap_hook_session_load(ap_session_cookie_load, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_session_save(ap_session_cookie_save, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_session_load(session_cookie_load, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_session_save(session_cookie_save, NULL, NULL, APR_HOOK_MIDDLE);
}

module AP_MODULE_DECLARE_DATA session_cookie_module =
+6 −10
Changes for modules/session/mod_session_dbd.c: 6 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -48,10 +48,6 @@ typedef struct {
    const char *deletelabel;
} session_dbd_dir_conf;

AP_DECLARE(int) ap_session_dbd_load(request_rec * r, session_rec ** z);
AP_DECLARE(int) ap_session_dbd_save(request_rec * r, session_rec * z);
AP_DECLARE(int) ap_session_dbd_monitor(apr_pool_t *p);

/* optional function - look it up once in post_config */
static ap_dbd_t *(*session_dbd_acquire_fn) (request_rec *) = NULL;
static void (*session_dbd_prepare_fn) (server_rec *, const char *, const char *) = NULL;
@@ -166,7 +162,7 @@ static apr_status_t dbd_load(request_rec * r, const char *key, const char **val)
 *
 * On success, this returns OK.
 */
AP_DECLARE(int) ap_session_dbd_load(request_rec * r, session_rec ** z)
static int session_dbd_load(request_rec * r, session_rec ** z)
{

    session_dbd_dir_conf *conf = ap_get_module_config(r->per_dir_config,
@@ -404,7 +400,7 @@ static apr_status_t dbd_clean(apr_pool_t *p)
 * @param r The request pointer.
 * @param z A pointer to where the session will be written.
 */
AP_DECLARE(int) ap_session_dbd_save(request_rec * r, session_rec * z)
static int session_dbd_save(request_rec * r, session_rec * z)
{

    char *buffer;
@@ -475,7 +471,7 @@ AP_DECLARE(int) ap_session_dbd_save(request_rec * r, session_rec * z)
 * This function performs housekeeping on the database, deleting expired
 * sessions.
 */
AP_DECLARE(int) ap_session_dbd_monitor(apr_pool_t *p)
static int session_dbd_monitor(apr_pool_t *p)
{
    /* TODO handle housekeeping */
    dbd_clean(p);
@@ -615,9 +611,9 @@ static const command_rec session_dbd_cmds[] =

static void register_hooks(apr_pool_t * p)
{
    ap_hook_session_load(ap_session_dbd_load, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_session_save(ap_session_dbd_save, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_monitor(ap_session_dbd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_session_load(session_dbd_load, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_session_save(session_dbd_save, NULL, NULL, APR_HOOK_MIDDLE);
    ap_hook_monitor(session_dbd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
}

module AP_MODULE_DECLARE_DATA session_dbd_module =