Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 17 Sep 2002 00:41:28 -0000
Message-ID: <20020917004128.32967.qmail@icarus.apache.org>
From: gstein@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/dav/main mod_dav.c

gstein      2002/09/16 17:41:28

  Modified:    modules/dav/main mod_dav.c
  Log:
  We need to set r->handler to indicate that we'll be handling the
  request. Otherwise, other modules may attempt to do "funny stuff" with
  the request (specifically: mod_dir will map /some/path/ into an
  index.html document if found).
  
  This reinstalls a fixups hook to set the r->handler value. Most of the
  checks in the dav_handler() function are now moved to the fixups hook.
  We just don't bother to set the handler unless all conditions are met.
  
  Revision  Changes    Path
  1.88      +50 -28    httpd-2.0/modules/dav/main/mod_dav.c
  
  Index: mod_dav.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.c,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- mod_dav.c	6 Sep 2002 00:26:10 -0000	1.87
  +++ mod_dav.c	17 Sep 2002 00:41:28 -0000	1.88
  @@ -101,6 +101,9 @@
   /* ### what is the best way to set this? */
   #define DAV_DEFAULT_PROVIDER    "filesystem"
   
  +/* used to denote that mod_dav will be handling this request */
  +#define DAV_HANDLER_NAME "dav-handler"
  +
   enum {
       DAV_ENABLED_UNSET = 0,
       DAV_ENABLED_OFF,
  @@ -4423,38 +4426,11 @@
    */
   static int dav_handler(request_rec *r)
   {
  -    dav_dir_conf *conf = ap_get_module_config(r->per_dir_config, &dav_module);
  -
  -    /* if DAV is not enabled, then we've got nothing to do */
  -    if (conf->provider == NULL) {
  +    if (strcmp(r->handler, DAV_HANDLER_NAME) != 0)
           return DECLINED;
  -    }
  -
  -    if (r->method_number == M_GET) {
  -        /*
  -         * ### need some work to pull Content-Type and Content-Language
  -         * ### from the property database.
  -         */
  -
  -        /*
  -         * If the repository hasn't indicated that it will handle the
  -         * GET method, then just punt.
  -         *
  -         * ### this isn't quite right... taking over the response can break
  -         * ### things like mod_negotiation. need to look into this some more.
  -         */
  -        if (!conf->provider->repos->handle_get) {
  -            return DECLINED;
  -        }
  -    }
   
       /* ### do we need to do anything with r->proxyreq ?? */
   
  -    /* quickly ignore any HTTP/0.9 requests which aren't subreqs. */
  -    if (r->assbackwards && !r->main) {
  -        return DECLINED;
  -    }
  -
       /*
        * ### anything else to do here? could another module and/or
        * ### config option "take over" the handler here? i.e. how do
  @@ -4618,10 +4594,56 @@
       return DECLINED;
   }
   
  +static int dav_fixups(request_rec *r)
  +{
  +    dav_dir_conf *conf;
  +
  +    /* quickly ignore any HTTP/0.9 requests which aren't subreqs. */
  +    if (r->assbackwards && !r->main) {
  +        return DECLINED;
  +    }
  +
  +    conf = (dav_dir_conf *)ap_get_module_config(r->per_dir_config,
  +                                                &dav_module);
  +
  +    /* if DAV is not enabled, then we've got nothing to do */
  +    if (conf->provider == NULL) {
  +        return DECLINED;
  +    }
  +
  +    /* We are going to handle almost every request. In certain cases,
  +       the provider maps to the filesystem (thus, handle_get is
  +       FALSE), and core Apache will handle it. a For that case, we
  +       just return right away.  */
  +    if (r->method_number == M_GET) {
  +        /*
  +         * ### need some work to pull Content-Type and Content-Language
  +         * ### from the property database.
  +         */
  +
  +        /*
  +         * If the repository hasn't indicated that it will handle the
  +         * GET method, then just punt.
  +         *
  +         * ### this isn't quite right... taking over the response can break
  +         * ### things like mod_negotiation. need to look into this some more.
  +         */
  +        if (!conf->provider->repos->handle_get) {
  +            return DECLINED;
  +        }
  +    }
  +
  +    /* We are going to be handling the response for this resource. */
  +    r->handler = DAV_HANDLER_NAME;
  +
  +    return OK;
  +}
  +
   static void register_hooks(apr_pool_t *p)
   {
       ap_hook_handler(dav_handler, NULL, NULL, APR_HOOK_MIDDLE);
       ap_hook_post_config(dav_init_handler, NULL, NULL, APR_HOOK_MIDDLE);
  +    ap_hook_fixups(dav_fixups, NULL, NULL, APR_HOOK_MIDDLE);
   
       dav_hook_find_liveprop(dav_core_find_liveprop, NULL, NULL, APR_HOOK_LAST);
       dav_hook_insert_all_liveprops(dav_core_insert_all_liveprops,