- Changed 'method' to 'handler' throughout

- Fixed bug in hash.c with unitialized memory
- Imported new hash table features
- Writes out pid file when requested with -p option

1 files changed, 10 insertions, 10 deletions

diff --git a/apache1x/mod_httpauth.c b/apache1x/mod_httpauth.c
index 39cdd8d..43dfa1b 100644
--- a/apache1x/mod_httpauth.c
+++ b/apache1x/mod_httpauth.c
@@ -19,7 +19,7 @@ typedef struct httpauth_context
   const char* socketname;
   int socket;
   int types;
-  const char* method;
+  const char* handler;
   const char* domain;
   pool* child_pool;
 }
@@ -66,10 +66,10 @@ static const char* set_socket(cmd_parms* cmd, void* config, const char* val)
   return NULL;
 }
 
-static const char* set_method(cmd_parms* cmd, void* config, const char* val)
+static const char* set_handler(cmd_parms* cmd, void* config, const char* val)
 {
   httpauth_context_t* conf = (httpauth_context_t*)config;
-  conf->method = val;
+  conf->handler = val;
   return NULL;
 }
 
@@ -108,8 +108,8 @@ static const command_rec httpauth_cmds[] =
 {
   { "HttpAuthSocket", set_socket, NULL, OR_AUTHCFG, TAKE1,
     "The socket that httpauthd is listening on" },
-  { "HttpAuthMethod", set_method, NULL, OR_AUTHCFG, TAKE1,
-    "The method that httpauthd should use to authenticate" },
+  { "HttpAuthHandler", set_handler, NULL, OR_AUTHCFG, TAKE1,
+    "The handler that httpauthd should use to authenticate" },
   { "HttpAuthTypes", set_types, NULL, OR_AUTHCFG, ITERATE,
     "The types of authentiction allowed (Basic, Digest, NTLM ...)" },
   { "HttpAuthDigestDomain", set_domain, NULL, OR_AUTHCFG, RAW_ARGS,
@@ -518,16 +518,16 @@ int connect_httpauth(httpauth_context_t* ctx, request_rec* r)
     goto finally;
   }
 
-  /* Send our method */
-  if(ctx->method)
+  /* Send our handler */
+  if(ctx->handler)
   {
-    t = ap_pstrcat(r->pool, "SET Method ", ctx->method, "\n", NULL);
+    t = ap_pstrcat(r->pool, "SET Handler ", ctx->handler, "\n", NULL);
 
     if(write_data(ctx, r->server, t) == -1)
       goto finally;
 
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, r,
-      "httpauth: sent method to daemon: %s", t);
+      "httpauth: sent handler to daemon: %s", t);
 
     if(read_response(ctx, r, &code, NULL, NULL) == -1)
       goto finally;
@@ -659,7 +659,7 @@ static int httpauth_authenticate(request_rec* r)
   ctx = (httpauth_context_t*)ap_get_module_config(r->per_dir_config,
                                                   &httpauth_module);
 
-  if(!ctx->socketname || !ctx->method)
+  if(!ctx->socketname || !ctx->handler)
     return DECLINED;
 
   mainreq = r;