You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2008/06/07 02:46:19 UTC
svn commit: r664217 - in /httpd/httpd/trunk/modules/session:
mod_session_cookie.c mod_session_dbd.c
Author: wrowe
Date: Fri Jun 6 17:46:19 2008
New Revision: 664217
URL: http://svn.apache.org/viewvc?rev=664217&view=rev
Log:
You don't export registered entry points
Modified:
httpd/httpd/trunk/modules/session/mod_session_cookie.c
httpd/httpd/trunk/modules/session/mod_session_dbd.c
Modified: httpd/httpd/trunk/modules/session/mod_session_cookie.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_cookie.c?rev=664217&r1=664216&r2=664217&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session_cookie.c (original)
+++ httpd/httpd/trunk/modules/session/mod_session_cookie.c Fri Jun 6 17:46:19 2008
@@ -39,9 +39,6 @@
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 @@
* @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 @@
*
* 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 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 =
Modified: httpd/httpd/trunk/modules/session/mod_session_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_dbd.c?rev=664217&r1=664216&r2=664217&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session_dbd.c (original)
+++ httpd/httpd/trunk/modules/session/mod_session_dbd.c Fri Jun 6 17:46:19 2008
@@ -48,10 +48,6 @@
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 @@
*
* 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 @@
* @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 @@
* 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 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 =