httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/support apxs.in
Date Mon, 22 Jan 2001 01:11:02 GMT
dougm       01/01/21 17:11:02

  Modified:    support  apxs.in
  Log:
  adjust to ap_hook_handler changes
  
  Revision  Changes    Path
  1.15      +11 -10    httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apxs.in	2000/12/19 23:33:54	1.14
  +++ apxs.in	2001/01/22 01:11:01	1.15
  @@ -565,7 +565,7 @@
   **  [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 @@
   **  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 @@
   **
   **    $ 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 @@
   /* 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 @@
       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 @@
       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                      */
   };
   
  
  
  

Mime
View raw message