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

[brian]

brian       98/03/29 20:17:37

  Modified:    src/modules/proxy proxy_util.c
  Log:
  PR: 1326, 1573, 1942
  Submitted by: [EMAIL PROTECTED] (Rainer Scherg RTC)
  Reviewed by: [EMAIL PROTECTED] (Lukas Karrer), Brian Behlendorf
  
  Fix for CONNECT problems in proxy.
  
  Revision  Changes    Path
  1.55      +11 -2     apache-1.3/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- proxy_util.c      1998/03/25 15:17:06     1.54
  +++ proxy_util.c      1998/03/30 04:17:36     1.55
  @@ -996,6 +996,9 @@
       const char *found;
       const char *host = proxy_get_host_of_request(r);
   
  +    if (host == NULL)   /* oops! */
  +       return 0;
  +
       memset(&addr, '\0', sizeof addr);
       memset(ip_addr, '\0', sizeof ip_addr);
   
  @@ -1153,8 +1156,14 @@
   {
       char *host = This->name;
       char *host2 = proxy_get_host_of_request(r);
  -    int h2_len = strlen(host2);
  -    int h1_len = strlen(host);
  +    int h2_len;
  +    int h1_len;
  +
  +    if (host == NULL || host2 == NULL)
  +       return 0; /* oops! */
  +
  +    h2_len = strlen(host2);
  +    h1_len = strlen(host);
   
   #if 0
       unsigned long *ip_list;