cvs commit: apache-1.3/src/main http_vhost.c

[dgaudet]

dgaudet     98/02/01 13:19:31

  Modified:    src/main http_vhost.c
  Log:
  really fix the hostname problem, without a SEGV on proxied urls this time
  
  Revision  Changes    Path
  1.6       +5 -8      apache-1.3/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_vhost.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- http_vhost.c      1998/02/01 04:54:47     1.5
  +++ http_vhost.c      1998/02/01 21:19:30     1.6
  @@ -737,19 +737,16 @@
   
   void update_vhost_from_headers(request_rec *r)
   {
  +    /* must set this for HTTP/1.1 support */
  +    if (r->hostname || (r->hostname = table_get(r->headers_in, "Host"))) {
  +     fix_hostname(r);
  +    }
       /* check if we tucked away a name_chain */
       if (r->connection->vhost_lookup_data) {
  -        if (r->hostname || (r->hostname = table_get(r->headers_in, "Host"))) 
{
  -         fix_hostname(r);
  +        if (r->hostname)
               check_hostalias(r);
  -     }
           else
               check_serverpath(r);
  -    }
  -    else if (!r->hostname) {
  -        /* must set this for HTTP/1.1 support */
  -        r->hostname = table_get(r->headers_in, "Host");
  -     fix_hostname(r);
       }
   }