You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@hyperreal.org on 1999/08/28 01:47:10 UTC

cvs commit: apache-2.0/src/main http_config.c

fielding    99/08/27 16:47:10

  Modified:    src      CHANGES
               src/main http_config.c
  Log:
  Move "handler not found" warning message to below the check
  for a wildcard handler.  Gee, you'd think someone would have
  fixed it before seven PRs.
  
  PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
  Submitted by: Dirk <di...@teleport.com>, Roy Fielding
  
  Revision  Changes    Path
  1.3       +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CHANGES	1999/08/27 14:37:13	1.2
  +++ CHANGES	1999/08/27 23:47:08	1.3
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0-dev
   
  +  *) Move "handler not found" warning message to below the check
  +     for a wildcard handler.  [Dirk <di...@teleport.com>, Roy Fielding]
  +     PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
  +
     *) Support line-continuation feature in config.option file.
        [Ralf S. Engelschall]
   
  
  
  
  1.7       +4 -5      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- http_config.c	1999/08/27 22:03:06	1.6
  +++ http_config.c	1999/08/27 23:47:09	1.7
  @@ -338,11 +338,6 @@
           }
       }
   
  -    if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
  -            "handler \"%s\" not found for: %s", r->handler, r->filename);
  -    }
  -
       /* Pass two --- wildcard matches */
   
       for (handp = wildhandlers; handp->hr.content_type; ++handp) {
  @@ -355,6 +350,10 @@
            }
       }
   
  +    if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler && r->filename) {
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
  +            "handler \"%s\" not found for: %s", r->handler, r->filename);
  +    }
       return HTTP_INTERNAL_SERVER_ERROR;
   }