X-Git-Url: https://git.hcoop.net/hcoop/debian/libapache-mod-waklog.git/blobdiff_plain/792d0e60ef40c449f58d049c28527a6c5de003f2..HEAD:/mod_waklog.c?ds=sidebyside diff --git a/mod_waklog.c b/mod_waklog.c index c76ab42..614cf33 100644 --- a/mod_waklog.c +++ b/mod_waklog.c @@ -48,6 +48,7 @@ module waklog_module; #include "http_connection.h" #include #include +#include #define ap_pcalloc apr_pcalloc #define ap_pdupstr apr_pdupstr #define ap_pstrdup apr_pstrdup @@ -79,6 +80,7 @@ APLOG_USE_MODULE(waklog); #include #include #include +#include #include #define TKT_LIFE ( 12 * 60 * 60 ) @@ -1269,7 +1271,6 @@ waklog_init_handler (apr_pool_t * p, apr_pool_t * plog, apr_pool_t * ptemp, server_rec * s) { int rv; - extern char *version; apr_proc_t *proc; waklog_config *cfg; void *data; @@ -1306,7 +1307,7 @@ waklog_init_handler (apr_pool_t * p, apr_pool_t * plog, else { log_error (APLOG_MARK, APLOG_INFO, 0, s, - "mod_waklog: version %s initialized for cell %s", version, cfg->afs_cell); + "mod_waklog: version %s initialized for cell %s", VERSION, cfg->afs_cell); if ( sharedspace ) { log_error(APLOG_MARK, APLOG_ERR, 0, s, "mod_waklog: shared memory already allocated." ); @@ -1403,7 +1404,7 @@ waklog_init_handler (apr_pool_t * p, apr_pool_t * plog, /* wait here until our child process has gone and done it's renewing thing. */ while( sharedspace->renewcount == oldrenewcount ) { log_error( APLOG_MARK, APLOG_ERR, 0, s, "mod_waklog: waiting for tokens..." ); - sleep(2); + apr_sleep(150000); } } @@ -1417,7 +1418,6 @@ waklog_init_handler (apr_pool_t * p, apr_pool_t * plog, static void waklog_init (server_rec * s, MK_POOL * p) { - extern char *version; int pid; waklog_config *cfg; int fd = -1; @@ -1429,7 +1429,7 @@ waklog_init (server_rec * s, MK_POOL * p) #endif log_error (APLOG_MARK, APLOG_DEBUG, 0, s, - "mod_waklog: version %s initialized.", version); + "mod_waklog: version %s initialized.", VERSION); if ( sharedspace ) { log_error(APLOG_MARK, APLOG_ERR, 0, s, "mod_waklog: shared memory already allocated." );