httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/support ab.c
Date Tue, 21 Nov 2000 21:48:49 GMT
trawick     00/11/21 13:48:48

  Modified:    src/support ab.c
  Log:
  Don't use APR_INET6 unless APR_HAVE_INET6 is defined.
  
  Revision  Changes    Path
  1.36      +8 -3      apache-2.0/src/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/ab.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ab.c	2000/11/21 19:47:14	1.35
  +++ ab.c	2000/11/21 21:48:48	1.36
  @@ -886,14 +886,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.35 $>
apache-2.0");
  +        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.36 $>
apache-2.0");
           printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
           printf("Copyright (c) 1998-2000 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", AB_VERSION, "$Revision: 1.35 $");
  +        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i>
apache-2.0<br>\n", AB_VERSION, "$Revision: 1.36 $");
           printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
           printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
           printf("</p>\n<p>\n");
  @@ -942,6 +942,7 @@
       if (strlen(url) > 7 && strncmp(url, "http://", 7) == 0)
           url += 7;
       h = url;
  +#if APR_HAVE_INET6
       if (*url == '[') { /* RFC 2732 format */
           h = url + 1;
           url = strchr(h, ']');
  @@ -959,6 +960,7 @@
            */
           family = APR_INET6;
       }
  +#endif /* APR_HAVE_INET6 */
       if ((cp = strchr(url, ':')) != NULL) {
           *cp++ = '\0';
           p = cp;
  @@ -969,10 +971,13 @@
       strcpy(path, cp);
       *cp = '\0';
       strcpy(hostname, h);
  +#if APR_HAVE_INET6
       if (family == APR_INET6) {
           host_field = apr_psprintf(cntxt, "[%s]",hostname);
       }
  -    else {
  +    else 
  +#endif /* APR_HAVE_INET6 */
  +    {
           host_field = hostname;
       }
       if (p != NULL)
  
  
  

Mime
View raw message