cvs commit: apache-1.3/src/modules/proxy mod_proxy.c

[martin]

martin      98/03/26 02:10:55

  Modified:    src/modules/proxy mod_proxy.c
  Log:
  Use HTTP_BAD_REQUEST for BAD_REQUEST everywhere
  
  Revision  Changes    Path
  1.48      +1 -7      apache-1.3/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -u -r1.47 -r1.48
  --- mod_proxy.c       1998/03/20 07:56:54     1.47
  +++ mod_proxy.c       1998/03/26 10:10:49     1.48
  @@ -211,7 +211,7 @@
   
       p = strchr(url, ':');
       if (p == NULL || p == url)
  -     return BAD_REQUEST;
  +     return HTTP_BAD_REQUEST;
   
       return OK;               /* otherwise; we've done the best we can */
   }
  @@ -311,14 +311,8 @@
        int ii;
        struct dirconn_entry *list = (struct dirconn_entry *) 
conf->dirconn->elts;
   
  -/*        if (*++p == '/' && *++p == '/')   */
  -
        for (direct_connect = ii = 0; ii < conf->dirconn->nelts && 
!direct_connect; ii++) {
            direct_connect = list[ii].matcher(&list[ii], r);
  -#if DEBUGGING
  -         aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, r->server,
  -                     "URI and NoProxy: %s: %s", r->uri, list[ii].name);
  -#endif
        }
   #if DEBUGGING
        {