adjust to ap_hook_handler changes

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

diff --git a/support/apxs.in b/support/apxs.in
index 457d843b1a6294ef3ecd09e7776979c0d4c22e1d..b065f01d28d859e78260922a1f4afa328c98e02b 100644 (file)
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -565,7 +565,7 @@ stop:
 **  [Autogenerated via ``apxs -n %NAME% -g'']
 **
 **  To play with this sample module first compile it into a
-**  DSO file and install it into Apache's libexec directory 
+**  DSO file and install it into Apache's modules directory 
 **  by running:
 **
 **    $ apxs -c -i mod_%NAME%.c
@@ -574,7 +574,7 @@ stop:
 **  for the URL /%NAME% in as follows:
 **
 **    #   %TARGET%.conf
-**    LoadModule %NAME%_module libexec/mod_%NAME%.so
+**    LoadModule %NAME%_module modules/mod_%NAME%.so
 **    <Location /%NAME%>
 **    SetHandler %NAME%
 **    </Location>
@@ -583,7 +583,7 @@ stop:
 **
 **    $ apachectl restart
 **
-**  you immediately can request the URL /%NAME and watch for the
+**  you immediately can request the URL /%NAME% and watch for the
 **  output of this module. This can be achieved for instance via:
 **
 **    $ lynx -mime_header http://localhost/%NAME% 
@@ -607,6 +607,9 @@ stop:
 /* The sample content handler */
 static int %NAME%_handler(request_rec *r)
 {
+    if (strcmp(r->handler, "%NAME%")) {
+        return DECLINED;
+    }
     r->content_type = "text/html";      
     ap_send_http_header(r);
     if (!r->header_only)
@@ -614,11 +617,10 @@ static int %NAME%_handler(request_rec *r)
     return OK;
 }
 
-/* Dispatch list of content handlers */
-static const handler_rec %NAME%_handlers[] = { 
-    { "%NAME%", %NAME%_handler }, 
-    { NULL, NULL }
-};
+static void %NAME%_register_hooks(apr_pool_t *p)
+{
+    ap_hook_handler(%NAME%_handler, NULL, NULL, APR_HOOK_LAST);
+}
 
 /* Dispatch list for API hooks */
 module AP_MODULE_DECLARE_DATA %NAME%_module = {
@@ -628,7 +630,6 @@ module AP_MODULE_DECLARE_DATA %NAME%_module = {
     NULL,                  /* create per-server config structures */
     NULL,                  /* merge  per-server config structures */
     NULL,                  /* table of config file commands       */
-    %NAME%_handlers,       /* [#8] MIME-typed-dispatched handlers */
-    NULL                   /* register hooks                      */
+    %NAME%_register_hooks  /* register hooks                      */
 };