httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@hyperreal.org
Subject cvs commit: apache-1.3/src/modules/proxy proxy_util.c
Date Mon, 28 Dec 1998 12:59:31 GMT
martin      98/12/28 04:59:31

  Modified:    src      CHANGES
               src/modules/proxy proxy_util.c
  Log:
  RFC2396 allows the syntax http://host:/path (with no port number)
  but the proxy disallowed it (ap_proxy_canon_netloc()).
  
  PR:3530
  Submitted by:	David Kristol <dmk@bell-labs.com>
  
  Revision  Changes    Path
  1.1181    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1180
  retrieving revision 1.1181
  diff -u -r1.1180 -r1.1181
  --- CHANGES	1998/12/28 12:38:28	1.1180
  +++ CHANGES	1998/12/28 12:59:28	1.1181
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.4
   
  +  *) RFC2396 allows the syntax http://host:/path (with no port number)
  +     but the proxy disallowed it (ap_proxy_canon_netloc()).
  +     [David Kristol <dmk@bell-labs.com>] PR#3530
  +
     *) When modules update/modify the file name in the configfile_t structure,
        syntax errors will report the updated name, not the original one.
        [Fabien Coelho <coelho@cri.ensmp.fr>] PR#3573
  
  
  
  1.73      +7 -4      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.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- proxy_util.c	1998/12/24 18:07:39	1.72
  +++ proxy_util.c	1998/12/28 12:59:30	1.73
  @@ -263,11 +263,14 @@
   	    if (!ap_isdigit(strp[i]))
   		break;
   
  -	if (i == 0 || strp[i] != '\0')
  +	/* if (i == 0) the no port was given; keep default */
  +	if (strp[i] != '\0') {
   	    return "Bad port number in URL";
  -	*port = atoi(strp);
  -	if (*port > 65535)
  -	    return "Port number in URL > 65535";
  +	} else if (i > 0) {
  +	    *port = atoi(strp);
  +	    if (*port > 65535)
  +		return "Port number in URL > 65535";
  +	}
       }
       ap_str_tolower(host);		/* DNS names are case-insensitive */
       if (*host == '\0')
  
  
  

Mime
View raw message