httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/support ab.c
Date Fri, 31 May 2002 17:22:58 GMT
wrowe       2002/05/31 10:22:58

  Modified:    support  ab.c
  Log:
    Well, know that I'm aware that the ssl stuff was entirely premature, it's
    still worth committing the correct code to handle the port number.
  
  Revision  Changes    Path
  1.103     +15 -6     httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- ab.c	31 May 2002 16:31:29 -0000	1.102
  +++ ab.c	31 May 2002 17:22:58 -0000	1.103
  @@ -1398,14 +1398,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -	printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.102
$> apache-2.0");
  +	printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.103
$> apache-2.0");
   	printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
   	printf("Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/\n");
   	printf("\n");
       }
       else {
   	printf("<p>\n");
  -	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n",
AP_AB_BASEREVISION, "$Revision: 1.102 $");
  +	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n",
AP_AB_BASEREVISION, "$Revision: 1.103 $");
   	printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
   	printf(" Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/<br>\n");
   	printf("</p>\n<p>\n");
  @@ -1467,14 +1467,17 @@
       /* Save a copy for the proxy */
       fullurl = apr_pstrdup(cntxt, url);
   
  -    if (strlen(url) > 7 && strncmp(url, "http://", 7) == 0)
  +    if (strlen(url) > 7 && strncmp(url, "http://", 7) == 0) {
   	url += 7;
  +#if USE_SSL
  +	ssl = 0;
  +#endif
  +    }
       else
   #if USE_SSL
       if (strlen(url) > 8 && strncmp(url, "https://", 8) == 0) {
   	url += 8;
   	ssl = 1;
  -	port = 443;
       }
   #else
       if (strlen(url) > 8 && strncmp(url, "https://", 8) == 0) {
  @@ -1502,8 +1505,14 @@
       }
   
       if (port == 0) {		/* no port specified */
  -	port = 80;
  -    };
  +#if USE_SSL
  +        if (ssl == 1)
  +            port = 443;
  +        else
  +#endif
  +            port = 80;
  +    }
  +
       if ((
   #if USE_SSL
            (ssl == 1) && (port != 443)) || (( ssl == 0 ) && 
  
  
  

Mime
View raw message