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, 16 May 2000 02:42:57 GMT
trawick     00/05/15 19:42:57

  Modified:    src      CHANGES
               src/support ab.c
  Log:
  Fix some bugs (mostly lost 1.3 code) in ab's command-line processing.
  
  Revision  Changes    Path
  1.111     +3 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- CHANGES	2000/05/15 19:21:31	1.110
  +++ CHANGES	2000/05/16 02:42:56	1.111
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0a4
  +  *) Fix some bugs (mostly lost 1.3 code) in ab's command-line processing. 
  +     [Jeff Trawick]
  +
     *) Add the ability to hook into the config file reading phase.  Basically
        if a directive is specified EXEC_ON_READ, then when that directive is
        read from the config file, the assocaited function is executed.  This
  
  
  
  1.13      +29 -6     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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ab.c	2000/05/01 15:56:26	1.12
  +++ ab.c	2000/05/16 02:42:57	1.13
  @@ -838,14 +838,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -        printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.12 $>
apache-2.0");
  +        printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.13 $>
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", VERSION, "$Revision: 1.12 $");
  +        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i>
apache-2.0<br>\n", VERSION, "$Revision: 1.13 $");
           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");
  @@ -979,7 +979,7 @@
   #endif
   
       ap_optind = 1;
  -    while (ap_getopt(argc, argv, "n:c:t:T:p:v:kVhwx:y:z:", &c, cntxt) == APR_SUCCESS)
{
  +    while (ap_getopt(argc, argv, "n:c:t:T:p:v:kVhwix:y:z:C:H:P:A:", &c, cntxt) == APR_SUCCESS)
{
           switch (c) {
           case 'n':
               requests = atoi(ap_optarg);
  @@ -995,11 +995,12 @@
               break;
           case 'i':
               if (posting == 1)
  -                err("Cannot mix POST and HEAD");
  +                err("Cannot mix POST and HEAD\n");
               posting = -1;
  +            break;
           case 'p':
               if (posting != 0)
  -                err("Cannot mix POST and HEAD");
  +                err("Cannot mix POST and HEAD\n");
   
               if (0 == (r = open_postfile(ap_optarg))) {
                  posting = 1;
  @@ -1052,7 +1053,29 @@
           case 'H':
               strncat(hdrs, ap_optarg, sizeof(hdrs));
               strncat(hdrs, "\r\n", sizeof(hdrs));
  -            strcpy(content_type, ap_optarg);
  +            break;
  +	case 'w':
  +	    use_html = 1;
  +	    break;
  +	    /*
  +	     * if any of the following three are used, turn on html output
  +	     * automatically
  +	     */
  +	case 'x':
  +	    use_html = 1;
  +	    tablestring = ap_optarg;
  +	    break;
  +	case 'y':
  +	    use_html = 1;
  +	    trstring = ap_optarg;
  +	    break;
  +	case 'z':
  +	    use_html = 1;
  +	    tdstring = ap_optarg;
  +	    break;
  +	case 'h':
  +	    usage(argv[0]);
  +	    break;
           }
       }
   
  
  
  

Mime
View raw message