cvs commit: apache/src http_protocol.c

[Ben Laurie]

ben         96/08/24 08:48:22

  Modified:    src       http_protocol.c
  Log:
  check_hostalias obliterated the server port number. Fixed.
  
  Revision  Changes    Path
  1.43      +3 -2      apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -C3 -r1.42 -r1.43
  *** http_protocol.c   1996/08/20 11:50:50     1.42
  --- http_protocol.c   1996/08/24 15:48:21     1.43
  ***************
  *** 50,56 ****
     *
     */
      
  ! /* $Id: http_protocol.c,v 1.42 1996/08/20 11:50:50 paul Exp $ */
    
    /*
     * http_protocol.c --- routines which directly communicate with the
  --- 50,56 ----
     *
     */
      
  ! /* $Id: http_protocol.c,v 1.43 1996/08/24 15:48:21 ben Exp $ */
    
    /*
     * http_protocol.c --- routines which directly communicate with the
  ***************
  *** 573,578 ****
  --- 573,579 ----
    }
    
    void check_hostalias (request_rec *r) {
  +   char *savehost=r->hostname;
      char *host = getword(r->pool, &r->hostname, ':'); /* Get rid of port */
      int port = (*r->hostname) ? atoi(r->hostname) : 80;
      server_rec *s;
  ***************
  *** 586,592 ****
        host[l] = '\0';
      }
    
  !   r->hostname = host;
    
      for (s = r->server->next; s; s = s->next) {
        char *names = s->names;
  --- 587,593 ----
        host[l] = '\0';
      }
    
  !   r->hostname = savehost;
    
      for (s = r->server->next; s; s = s->next) {
        char *names = s->names;