httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache-1.3/src/main http_config.c http_core.c
Date Tue, 07 Jul 1998 04:06:24 GMT
dgaudet     98/07/06 21:06:24

  Modified:    src      CHANGES
               src/main http_config.c http_core.c
  Log:
  better solution for reporting handler not found errors
  
  PR:		2529
  Submitted by:	John Van Essen <jve@gamers.org>
  
  Revision  Changes    Path
  1.948     +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.947
  retrieving revision 1.948
  diff -u -r1.947 -r1.948
  --- CHANGES	1998/07/06 11:54:27	1.947
  +++ CHANGES	1998/07/07 04:06:17	1.948
  @@ -1,4 +1,8 @@
   Changes with Apache 1.3.1
  +  
  +  *) The "handler not found" error was issued in cases where the handler
  +     really did exist, but was just declining to serve the request.
  +     [John Van Essen <jve@gamers.org>] PR#2529
   
     *) Add Dynamic Shared Object (DSO) support for SCO5 (OpenServer 5.0.x).
        [Ronald Record <rr@sco.com>] PR#2533
  
  
  
  1.118     +8 -2      apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- http_config.c	1998/06/13 15:22:52	1.117
  +++ http_config.c	1998/07/07 04:06:20	1.118
  @@ -479,6 +479,7 @@
       const char *handler;
       char *p;
       size_t handler_len;
  +    int result = NOT_IMPLEMENTED;
   
       if (r->handler) {
   	handler = r->handler;
  @@ -501,19 +502,24 @@
       for (handp = handlers; handp->hr.content_type; ++handp) {
   	if (handler_len == handp->len
   	    && !strncmp(handler, handp->hr.content_type, handler_len)) {
  -            int result = (*handp->hr.handler) (r);
  +            result = (*handp->hr.handler) (r);
   
               if (result != DECLINED)
                   return result;
           }
       }
   
  +    if (result == NOT_IMPLEMENTED && r->handler) {
  +        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r->server,
  +            "handler \"%s\" not found for: %s", r->handler, r->filename);
  +    }
  +
       /* Pass two --- wildcard matches */
   
       for (handp = wildhandlers; handp->hr.content_type; ++handp) {
   	if (handler_len >= handp->len
   	    && !strncmp(handler, handp->hr.content_type, handp->len)) {
  -             int result = (*handp->hr.handler) (r);
  +             result = (*handp->hr.handler) (r);
   
                if (result != DECLINED)
                    return result;
  
  
  
  1.209     +0 -6      apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.208
  retrieving revision 1.209
  diff -u -r1.208 -r1.209
  --- http_core.c	1998/07/03 22:15:56	1.208
  +++ http_core.c	1998/07/07 04:06:21	1.209
  @@ -2548,12 +2548,6 @@
       caddr_t mm;
   #endif
   
  -    if (r->handler) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
  -	    r->server, "handler \"%s\" not found, using default "
  -	    "handler for: %s", r->handler, r->filename);
  -    }
  -
       /* This handler has no use for a request body (yet), but we still
        * need to read and discard it if the client sent one.
        */
  
  
  

Mime
View raw message