subject:"cvs commit\: apache\-1.3\/src\/support ab.c"

cvs commit: apache-1.3/src/support ab.c

2000-02-05 Thread rse

rse 00/02/05 01:50:57

  Modified:src/support ab.c
  Log:
  Typo
  
  Revision  ChangesPath
  1.38  +3 -3  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- ab.c  1999/12/10 11:03:40 1.37
  +++ ab.c  2000/02/05 09:50:54 1.38
  @@ -81,7 +81,7 @@
  **- Cleaned up by Ralf S. Engelschall [EMAIL PROTECTED], March 1998
  **- POST and verbosity by Kurt Sussman [EMAIL PROTECTED], August 
1998
  **- HTML table output added by David N. Welton [EMAIL PROTECTED], 
January 1999
  -   **- Added Cookie, Arbitrary header and auth support. [EMAIL 
PROTECTED], April 199
  +   **- Added Cookie, Arbitrary header and auth support. [EMAIL 
PROTECTED], April 1999
  **
*/
   
  @@ -884,14 +884,14 @@
   static void copyright(void)
   {
   if (!use_html) {
  - printf(This is ApacheBench, Version %s\n, VERSION  $Revision: 1.37 
$ apache-1.3);
  + printf(This is ApacheBench, Version %s\n, VERSION  $Revision: 1.38 
$ apache-1.3);
printf(Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, 
http://www.zeustech.net/\n;);
printf(Copyright (c) 1998-1999 The Apache Group, 
http://www.apache.org/\n;);
printf(\n);
   }
   else {
printf(p\n);
  - printf( This is ApacheBench, Version %s ilt;%sgt;/i 
apache-1.3br\n, VERSION, $Revision: 1.37 $);
  + printf( This is ApacheBench, Version %s ilt;%sgt;/i 
apache-1.3br\n, VERSION, $Revision: 1.38 $);
printf( Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, 
http://www.zeustech.net/br\n);
printf( Copyright (c) 1998-1999 The Apache Group, 
http://www.apache.org/br\n);
printf(/p\np\n);

cvs commit: apache-1.3/src/support ab.c

1999-10-27 Thread rse

rse 99/10/27 00:12:46

  Modified:src  CHANGES
   src/support ab.c
  Log:
  Made sure ApacheBench (ab) performs no more requests than
  specified on command line (option -n).
  
  Submitted by: Jim Cox [EMAIL PROTECTED]
  Reviewed by: Ralf S. Engelschall
  PR: 4839
  
  Revision  ChangesPath
  1.1438+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1437
  retrieving revision 1.1438
  diff -u -r1.1437 -r1.1438
  --- CHANGES   1999/10/13 02:38:18 1.1437
  +++ CHANGES   1999/10/27 07:12:40 1.1438
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.10
   
  +  *) Made sure ApacheBench (ab) performs no more requests than 
  + specified on command line (option -n).
  + [Jim Cox [EMAIL PROTECTED]] PR#4839
  +
 *) Support DSOs properly on 32-bit HP-UX 11.0
[Dilip Khandekar [EMAIL PROTECTED]]
   
  
  
  
  1.34  +2 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ab.c  1999/09/29 21:14:47 1.33
  +++ ab.c  1999/10/27 07:12:44 1.34
  @@ -536,7 +536,8 @@
   }
   
   /* connected first time */
  -write_request(c);
  +c-state = STATE_CONNECTING;
  +FD_SET(c-fd, writebits);
   }
   
   /* - */

cvs commit: apache-1.3/src/support ab.c

1999-10-27 Thread martin

martin  99/10/27 15:30:19

  Modified:src/support ab.c
  Log:
  Add CVS Revision number to ab.c to allow for detecting changes
  which were not marked by a version number update. Additionally,
  display base repository name (apache-1.3)
  
  Revision  ChangesPath
  1.35  +3 -3  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ab.c  1999/10/27 07:12:44 1.34
  +++ ab.c  1999/10/27 22:30:16 1.35
  @@ -97,7 +97,7 @@
*   only an issue for loopback usage
*/
   
  -#define VERSION 1.3b
  +#define VERSION 1.3c
   
   /*   */
   
  @@ -867,14 +867,14 @@
   static void copyright(void)
   {
   if (!use_html) {
  - printf(This is ApacheBench, Version %s\n, VERSION);
  + printf(This is ApacheBench, Version %s\n, VERSION  $Revision: 1.35 
$ apache-1.3);
printf(Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, 
http://www.zeustech.net/\n;);
printf(Copyright (c) 1998-1999 The Apache Group, 
http://www.apache.org/\n;);
printf(\n);
   }
   else {
printf(p\n);
  - printf( This is ApacheBench, Version %sbr\n, VERSION);
  + printf( This is ApacheBench, Version %s ilt;%sgt;/i 
apache-1.3br\n, VERSION, $Revision: 1.35 $);
printf( Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, 
http://www.zeustech.net/br\n);
printf( Copyright (c) 1998-1999 The Apache Group, 
http://www.apache.org/br\n);
printf(/p\np\n);

cvs commit: apache-1.3/src/support ab.c

1999-09-29 Thread dirkx

dirkx   99/09/29 14:14:49

  Modified:src/support ab.c
  Log:
  Patch supplied by [EMAIL PROTECTED] to make head+keepalives work
  
  Revision  ChangesPath
  1.33  +2 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ab.c  1999/09/28 12:34:57 1.32
  +++ ab.c  1999/09/29 21:14:47 1.33
  @@ -703,7 +703,8 @@
totalbread += r;
   }
   
  -if (c-keepalive  (c-bread = c-length)) {
  +/* cater for the case where we're using keepalives and doing HEAD 
requests */
  +if (c-keepalive  ((c-bread = c-length) || (posting  0))) {
/* finished a keep-alive connection */
good++;
doneka++;

cvs commit: apache-1.3/src/support ab.c

1999-09-28 Thread martin

martin  99/09/28 05:34:58

  Modified:src/support ab.c
  Log:
  New features should result in a new version number
  
  Revision  ChangesPath
  1.32  +1 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- ab.c  1999/09/27 20:27:24 1.31
  +++ ab.c  1999/09/28 12:34:57 1.32
  @@ -97,7 +97,7 @@
*   only an issue for loopback usage
*/
   
  -#define VERSION 1.3a
  +#define VERSION 1.3b
   
   /*   */

cvs commit: apache-1.3/src/support ab.c ab.8

1999-09-27 Thread dirkx

dirkx   99/09/27 13:27:37

  Modified:src/support ab.c ab.8
  Log:
  Adding a fifth, sixth or seventh wheel to this croaking cart... HEAD support.
  
  Revision  ChangesPath
  1.31  +20 -9 apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ab.c  1999/08/25 13:02:04 1.30
  +++ ab.c  1999/09/27 20:27:24 1.31
  @@ -254,7 +254,7 @@
   out[0].iov_base = request;
   out[0].iov_len = reqlen;
   
  -if (posting) {
  +if (posting0) {
out[1].iov_base = postdata;
out[1].iov_len = postlen;
outcnt = 2;
  @@ -263,7 +263,7 @@
   writev(c-fd,out, outcnt);
   #else
   write(c-fd,request,reqlen);
  -if (posting) {
  +if (posting0) {
   write(c-fd,postdata,postlen);
   totalposted += (reqlen + postlen);
   }
  @@ -331,7 +331,7 @@
   if (keepalive)
printf(Keep-Alive requests:%d\n, doneka);
   printf(Total transferred:  %d bytes\n, totalread);
  -if (posting)
  +if (posting0)
printf(Total POSTed:   %d\n, totalposted);
   printf(HTML transferred:   %d bytes\n, totalbread);
   
  @@ -340,7 +340,7 @@
printf(Requests per second:%.2f\n, 1000 * (float) (done) / 
timetaken);
printf(Transfer rate:  %.2f kb/s received\n,
   (float) (totalread) / timetaken);
  - if (posting) {
  + if (posting0) {
printf(%.2f kb/s sent\n,
   (float) (totalposted) / timetaken);
printf(%.2f kb/s total\n,
  @@ -429,7 +429,7 @@
   printf(tr %sth colspan=2 %sTotal transferred:/th
   td colspan=2 %s%d bytes/td/tr\n,
   trstring, tdstring, tdstring, totalread);
  -if (posting)
  +if (posting0)
printf(tr %sth colspan=2 %sTotal POSTed:/th
   td colspan=2 %s%d/td/tr\n,
   trstring, tdstring, tdstring, totalposted);
  @@ -445,7 +445,7 @@
printf(tr %sth colspan=2 %sTransfer rate:/th
   td colspan=2 %s%.2f kb/s received/td/tr\n,
 trstring, tdstring, tdstring, (float) (totalread) / timetaken);
  - if (posting) {
  + if (posting0) {
printf(tr %std colspan=2 %snbsp;/td
   td colspan=2 %s%.2f kb/s sent/td/tr\n,
   trstring, tdstring, tdstring,
  @@ -769,13 +769,14 @@
   FD_ZERO(writebits);
   
   /* setup request */
  -if (!posting) {
  - sprintf(request, GET %s HTTP/1.0\r\n
  +if (posting = 0) {
  + sprintf(request, %s %s HTTP/1.0\r\n
User-Agent: ApacheBench/%s\r\n
%s %s %s
Host: %s\r\n
Accept: */*\r\n
%s \r\n,
  + (posting == 0) ? GET : HEAD,
path,
VERSION,
keepalive ? Connection: Keep-Alive\r\n : ,
  @@ -890,6 +891,7 @@
   fprintf(stderr, -T content-type Content-type header for POSTing\n);
   fprintf(stderr, -v verbosityHow much troubleshooting info to 
print\n);
   fprintf(stderr, -w  Print out results in HTML 
tables\n);
  +fprintf(stderr, -i  Use HEAD instead of GET\n);
   fprintf(stderr, -x attributes   String to insert as table 
attributes\n);
   fprintf(stderr, -y attributes   String to insert as tr 
attributes\n);
   fprintf(stderr, -z attributes   String to insert as td or th 
attributes\n);
  @@ -983,7 +985,7 @@
   auth[0] = '\0';
   hdrs[0] = '\0';
   optind = 1;
  -while ((c = getopt(argc, argv, n:c:t:T:p:v:kVhwx:y:z:C:H:P:A:))  0) {
  +while ((c = getopt(argc, argv, n:c:t:T:p:v:kVhwix:y:z:C:H:P:A:))  0) {
switch (c) {
case 'n':
requests = atoi(optarg);
  @@ -997,7 +999,16 @@
case 'c':
concurrency = atoi(optarg);
break;
  + case 'i':
  + if (posting==1) 
  + err(Cannot mix POST and HEAD);
  +
  + posting = -1;
  + break;
case 'p':
  + if (posting!=0) 
  + err(Cannot mix POST and HEAD);
  +
if (0 == (r = open_postfile(optarg))) {
posting = 1;
}
  
  
  
  1.7   +6 -1  apache-1.3/src/support/ab.8
  
  Index: ab.8
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/support/ab.8,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ab.8  1999/04/07 14:51:43 1.6
  +++ ab.8  1999/09/27 20:27:27 1.7
  @@ -1,5 +1,5 @@
   .TH ab 1 March 1998
  -.\ $Id: ab.8,v 1.6 1999/04/07 14:51:43 martin Exp $
  +.\ $Id: ab.8,v 1.7 1999/09/27 20:27:27 dirkx Exp $
   .\ Copyright (c) 1998-1999 The Apache

cvs commit: apache-1.3/src/support ab.c

1999-08-25 Thread dirkx

dirkx   99/08/25 06:02:04

  Modified:src/support ab.c
  Log:
  Fixed -H header flag for GETs their CR/LF termination.
  
  PR: 4904
  Submitted by:  Jean-Francois LE CAM [EMAIL PROTECTED]
  Reviewed by: dirkx
  
  Revision  ChangesPath
  1.30  +1 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- ab.c  1999/08/12 18:06:28 1.29
  +++ ab.c  1999/08/25 13:02:04 1.30
  @@ -775,7 +775,7 @@
%s %s %s
Host: %s\r\n
Accept: */*\r\n
  - \r\n %s,
  + %s \r\n,
path,
VERSION,
keepalive ? Connection: Keep-Alive\r\n : ,

cvs commit: apache-1.3/src/support ab.c

1999-08-12 Thread dirkx

dirkx   99/08/12 11:06:30

  Modified:src/ap   ap_base64.c ap_sha1.c
   src/include ap.h httpd.h
   src/main util.c
   src/support ab.c
  Log:
  Resolution naming problems,
  
  Rename of
*uuXXcode - base64
  
  rename of the old routines
  
ap_uuXXcode - ap_puuXXcode
  
  to signal that they are 'pool'ing.
  
  Plus a wrapper to maintain the old name;
  
ap_uuencode
  
  which just calls ap_puuencode. Used a wrapper rather than
  a #define to faciliate linkers.
  
  Revision  ChangesPath
  1.3   +10 -10apache-1.3/src/ap/ap_base64.c
  
  Index: ap_base64.c
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/ap/ap_base64.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_base64.c   1999/08/08 17:38:45 1.2
  +++ ap_base64.c   1999/08/12 18:06:17 1.3
  @@ -111,7 +111,7 @@
   #endif /*CHARSET_EBCDIC*/
   };
   
  -API_EXPORT(int) ap_uudecode_len(const char *bufcoded)
  +API_EXPORT(int) ap_base64decode_len(const char *bufcoded)
   {
   int nbytesdecoded;
   register const unsigned char *bufin;
  @@ -126,14 +126,14 @@
   return nbytesdecoded + 1;
   }
   
  -API_EXPORT(int) ap_uudecode(char *bufplain, const char *bufcoded)
  +API_EXPORT(int) ap_base64decode(char *bufplain, const char *bufcoded)
   {
   #ifdef CHARSET_EBCDIC
   int i;
   #endif   /* CHARSET_EBCDIC */
   int len;
   
  -len = ap_uudecode_binary((unsigned char *) bufplain, bufcoded);
  +len = ap_base64decode_binary((unsigned char *) bufplain, bufcoded);
   #ifdef CHARSET_EBCDIC
   for (i=0; ilen; i++)
bufplain[i] = os_toebcdic[bufplain[i]];
  @@ -141,10 +141,10 @@
   return len;
   }
   
  -/* This is the same as ap_uudecode() except on EBCDIC machines, where
  +/* This is the same as ap_base64udecode() except on EBCDIC machines, where
* the conversion of the output to ebcdic is left out.
*/
  -API_EXPORT(int) ap_uudecode_binary(unsigned char *bufplain,
  +API_EXPORT(int) ap_base64decode_binary(unsigned char *bufplain,
   const char *bufcoded)
   {
   int nbytesdecoded;
  @@ -193,15 +193,15 @@
   static const char basis_64[] =
   ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/;
   
  -API_EXPORT(int) ap_uuencode_len(int len)
  +API_EXPORT(int) ap_base64encode_len(int len)
   {
   return ((len + 2) / 3 * 4) + 1;
   }
   
  -API_EXPORT(int) ap_uuencode(char *encoded, const char *string, int len)
  +API_EXPORT(int) ap_base64encode(char *encoded, const char *string, int len)
   {
   #ifndef CHARSET_EBCDIC
  -return ap_uuencode_binary(encoded, (const unsigned char *) string, len);
  +return ap_base64encode_binary(encoded, (const unsigned char *) string, 
len);
   #else/* CHARSET_EBCDIC */
   int i;
   char *p;
  @@ -231,10 +231,10 @@
   #endif   /* CHARSET_EBCDIC */
   }
   
  -/* This is the same as ap_uuencode() except on EBCDIC machines, where
  +/* This is the same as ap_base64encode() except on EBCDIC machines, where
* the conversion of the input to ascii is left out.
*/
  -API_EXPORT(int) ap_uuencode_binary(char *encoded, const unsigned char 
*string,
  +API_EXPORT(int) ap_base64encode_binary(char *encoded, const unsigned char 
*string,
   int len)
   {
   int i;
  
  
  
  1.8   +1 -1  apache-1.3/src/ap/ap_sha1.c
  
  Index: ap_sha1.c
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/ap/ap_sha1.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ap_sha1.c 1999/08/10 11:31:53 1.7
  +++ ap_sha1.c 1999/08/12 18:06:18 1.8
  @@ -379,7 +379,7 @@
   strcpy(out, sha1_id);
   
   /* SHA1 hash is always 20 chars */
  -l = ap_uuencode_binary(out + strlen(sha1_id), digest, sizeof(digest));
  +l = ap_base64encode_binary(out + strlen(sha1_id), digest, 
sizeof(digest));
   out[l + strlen(sha1_id)] = '\0';
   
   /*
  
  
  
  1.24  +6 -6  apache-1.3/src/include/ap.h
  
  Index: ap.h
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/include/ap.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ap.h  1999/08/08 11:45:16 1.23
  +++ ap.h  1999/08/12 18:06:20 1.24
  @@ -171,13 +171,13 @@
* strings are neither. But propably should.
*
*/
  -API_EXPORT(int) ap_uuencode_len(int len);
  -API_EXPORT(int) ap_uuencode(char * coded_dst, const char *plain_src,int 
len_plain_src);
  -API_EXPORT(int) ap_uuencode_binary(char * coded_dst, const unsigned char 
*plain_src,int len_plain_src);
  +API_EXPORT(int) ap_base64encode_len(int len);
  +API_EXPORT(int) ap_base64encode(char

cvs commit: apache-1.3/src/support ab.c

1999-08-08 Thread dirkx

dirkx   99/08/08 04:45:20

  Modified:src/ap   Makefile.tmpl ap_sha1.c
   src/include ap.h ap_sha1.h httpd.h
   src/main http_protocol.c util.c
   src/modules/proxy proxy_ftp.c
   src/support ab.c
  Log:
  Collating various peoples patches on base64, md5 and sha1
  which sanitize the uuencoding used in various places a
  little bit; and getting rid of all the warnings.
  
  What is left now is moving ap_sha1.h and ap_md5.h into
  ap.h OR #including them there and modularizing the ap.h
  file. Secondly it might be nice to swap the base64-ish
  encoding used in apache's its own MD5 passwords to the
  uu-encoded one to get rid of those routines. But that
  would break compatibility betwen the 1.x series.
  
  Let's hope this is all for now.
  
   Modified Files:
ap/Makefile.tmpl ap/ap_checkpass.c ap/ap_md5c.c ap/ap_sha1.c
include/ap.h include/ap_sha1.h include/httpd.h
main/http_protocol.c main/util.c modules/proxy/proxy_ftp.c
support/ab.c
  
  Revision  ChangesPath
  1.34  +1 -1  apache-1.3/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Makefile.tmpl 1999/08/02 10:13:44 1.33
  +++ Makefile.tmpl 1999/08/08 11:45:15 1.34
  @@ -6,7 +6,7 @@
   LIB=libap.a
   
   OBJS=ap_cpystrn.o ap_execve.o ap_fnmatch.o ap_getpass.o ap_md5c.o 
ap_signal.o \
  - ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o
  + ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o ap_base64.o
   
   .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
  
  
  
  1.4   +85 -102   apache-1.3/src/ap/ap_sha1.c
  
  Index: ap_sha1.c
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/ap/ap_sha1.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ap_sha1.c 1999/08/05 20:04:01 1.3
  +++ ap_sha1.c 1999/08/08 11:45:15 1.4
  @@ -6,7 +6,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  + *notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
  @@ -70,10 +70,10 @@
* will always generate the same hash, making it easier
* to break since the search space is smaller.
*
  - * See also the documentation in support/SHA1 as to hints on how to 
  + * See also the documentation in support/SHA1 as to hints on how to
* migrate an existing netscape installation and other supplied utitlites.
*
  - * This software also makes use of the following components: 
  + * This software also makes use of the following components:
*
* NIST Secure Hash Algorithm
*   heavily modified by Uwe Hollerbach [EMAIL PROTECTED] edu
  @@ -86,15 +86,15 @@
*
* Metamail's copyright is:
*   Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
  - *   Permission to use, copy, modify, and distribute this material 
  - *   for any purpose and without fee is hereby granted, provided 
  - *   that the above copyright notice and this permission notice 
  - *   appear in all copies, and that the name of Bellcore not be 
  - *   used in advertising or publicity pertaining to this 
  - *   material without the specific, prior written permission 
  - *   of an authorized representative of Bellcore.  BELLCORE 
  - *   MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
  - *   OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED AS IS, 
  + *   Permission to use, copy, modify, and distribute this material
  + *   for any purpose and without fee is hereby granted, provided
  + *   that the above copyright notice and this permission notice
  + *   appear in all copies, and that the name of Bellcore not be
  + *   used in advertising or publicity pertaining to this
  + *   material without the specific, prior written permission
  + *   of an authorized representative of Bellcore.  BELLCORE
  + *   MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
  + *   OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED AS IS,
*   WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
*/
   
  @@ -133,30 +133,13 @@
   temp = ROT32(A,5) + f##n(B,C,D) + E + W[i] + CONST##n;   \
   E = D; D = C; C = ROT32(B,30); B = A; A = temp
   
  -typedef unsigned char AP_BYTE; /* an 8-bit quantity */
  -typedef unsigned long AP_LONG; /* a 32-bit quantity */
  - 
   #define SHA_BLOCKSIZE   64
   #define SHA_DIGESTSIZE  20
  - 
  -typedef struct {
  -AP_LONG digest[5]; /* message digest */
  -AP_LONG count_lo,

cvs commit: apache-1.3/src/support ab.c

1999-08-08 Thread dirkx

dirkx   99/08/08 04:47:47

  Modified:src/support ab.c
  Log:
  Hmm, cvs does not always remove files. Sorry.
  
   Modified Files:
ab.c
  
  Revision  ChangesPath
  1.28  +1 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ab.c  1999/08/08 11:45:20 1.27
  +++ ab.c  1999/08/08 11:47:47 1.28
  @@ -123,7 +123,7 @@
   #define ap_select   select
   #else/* (!)NO_APACHE_INCLUDES */
   #include ap_config.h
  -#include ap_base64.h
  +#include ap.h
   #ifdef CHARSET_EBCDIC
   #include ebcdic.h
   #endif

cvs commit: apache-1.3/src/support ab.c

1999-07-19 Thread martin

martin  99/07/19 00:20:08

  Modified:src/support ab.c
  Log:
  Avoid core dumps when no responses were received
  
  Revision  ChangesPath
  1.26  +32 -28apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ab.c  1999/05/04 10:24:17 1.25
  +++ ab.c  1999/07/19 07:19:43 1.26
  @@ -97,7 +97,7 @@
*   only an issue for loopback usage
*/
   
  -#define VERSION 1.3
  +#define VERSION 1.3a
   
   /*   */
   
  @@ -413,13 +413,15 @@
totalcon += s.ctime;
total += s.time;
}
  - printf(\nConnnection Times (ms)\n);
  - printf(  min   avg   max\n);
  - printf(Connect:%5d %5d %5d\n, mincon, totalcon / requests, 
maxcon);
  - printf(Processing: %5d %5d %5d\n,
  -mintot - mincon, (total / requests) - (totalcon / requests),
  -maxtot - maxcon);
  - printf(Total:  %5d %5d %5d\n, mintot, total / requests, maxtot);
  + if (requests  0) { /* avoid division by zero (if 0 requests) */
  + printf(\nConnnection Times (ms)\n);
  + printf(  min   avg   max\n);
  + printf(Connect:%5d %5d %5d\n, mincon, totalcon / requests, 
maxcon);
  + printf(Processing: %5d %5d %5d\n,
  +mintot - mincon, (total / requests) - (totalcon / requests),
  +maxtot - maxcon);
  + printf(Total:  %5d %5d %5d\n, mintot, total / requests, 
maxtot);
  + }
   }
   }
   
  @@ -521,26 +523,28 @@
total += s.time;
}
   
  - printf(tr %sth %s colspan=4Connnection Times (ms)/th/tr\n,
  -trstring, tdstring);
  - printf(tr %sth %snbsp;/th th %smin/th   th %savg/th   
th %smax/th/tr\n,
  -trstring, tdstring, tdstring, tdstring, tdstring);
  - printf(tr %sth %sConnect:/th
  -td %s%5d/td
  -td %s%5d/td
  -td %s%5d/td/tr\n,
  -trstring, tdstring, tdstring, mincon, tdstring, totalcon / 
requests, tdstring, maxcon);
  - printf(tr %sth %sProcessing:/th
  -td %s%5d/td
  -td %s%5d/td
  -td %s%5d/td/tr\n,
  -trstring, tdstring, tdstring, mintot - mincon, tdstring,
  -(total / requests) - (totalcon / requests), tdstring, maxtot - 
maxcon);
  - printf(tr %sth %sTotal:/th
  -td %s%5d/td
  -td %s%5d/td
  -td %s%5d/td/tr\n,
  -trstring, tdstring, tdstring, mintot, tdstring, total / 
requests, tdstring, maxtot);
  + if (requests  0) { /* avoid division by zero (if 0 requests) */
  + printf(tr %sth %s colspan=4Connnection Times (ms)/th/tr\n,
  +trstring, tdstring);
  + printf(tr %sth %snbsp;/th th %smin/th   th %savg/th 
  th %smax/th/tr\n,
  +trstring, tdstring, tdstring, tdstring, tdstring);
  + printf(tr %sth %sConnect:/th
  +td %s%5d/td
  +td %s%5d/td
  +td %s%5d/td/tr\n,
  +trstring, tdstring, tdstring, mincon, tdstring, totalcon / 
requests, tdstring, maxcon);
  + printf(tr %sth %sProcessing:/th
  +td %s%5d/td
  +td %s%5d/td
  +td %s%5d/td/tr\n,
  +trstring, tdstring, tdstring, mintot - mincon, tdstring,
  +(total / requests) - (totalcon / requests), tdstring, maxtot 
- maxcon);
  + printf(tr %sth %sTotal:/th
  +td %s%5d/td
  +td %s%5d/td
  +td %s%5d/td/tr\n,
  +trstring, tdstring, tdstring, mintot, tdstring, total / 
requests, tdstring, maxtot);
  + }
printf(/table\n);
   }
   }

cvs commit: apache-1.3/src/support ab.c

1999-05-04 Thread martin

martin  99/05/04 03:24:17

  Modified:src/support ab.c
  Log:
  Add missing include for EBCDIC
  
  Revision  ChangesPath
  1.25  +3 -0  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ab.c  1999/04/22 11:06:48 1.24
  +++ ab.c  1999/05/04 10:24:17 1.25
  @@ -123,6 +123,9 @@
   #define ap_select   select
   #else/* (!)NO_APACHE_INCLUDES */
   #include ap_config.h
  +#ifdef CHARSET_EBCDIC
  +#include ebcdic.h
  +#endif
   #include fcntl.h
   #include sys/time.h

cvs commit: apache-1.3/src/support ab.c

1999-04-22 Thread rse

rse 99/04/22 04:01:54

  Modified:src/support ab.c
  Log:
  typo
  
  Revision  ChangesPath
  1.23  +1 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ab.c  1999/04/20 12:03:29 1.22
  +++ ab.c  1999/04/22 11:01:53 1.23
  @@ -664,7 +664,7 @@
s = strstr(c-cbuff, \r\n\r\n);
/*
 * this next line is so that we talk to NCSA 1.5 which blatantly
  -  * breaks the http specifaction
  +  * breaks the http specification
 */
if (!s) {
s = strstr(c-cbuff, \n\n);

cvs commit: apache-1.3/src/support ab.c

1999-04-22 Thread rse

rse 99/04/22 04:06:48

  Modified:src  CHANGES
   src/support ab.c
  Log:
  Fix number of bytes copied by read_connection() in src/support/ab.c
  
  Submitted by: Jim Cox [EMAIL PROTECTED]
  Reviewed by: Ralf S. Engelschall
  PR: 4271
  
  Revision  ChangesPath
  1.1326+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1325
  retrieving revision 1.1326
  diff -u -r1.1325 -r1.1326
  --- CHANGES   1999/04/22 10:48:57 1.1325
  +++ CHANGES   1999/04/22 11:06:45 1.1326
  @@ -1,4 +1,7 @@
   Changes with Apache 1.3.7
  +  
  +  *) Fix number of bytes copied by read_connection() in src/support/ab.c
  + [Jim Cox [EMAIL PROTECTED]] PR#4271
   
 *) Fix special RewriteCond -s pattern matching.
[Bob Finch [EMAIL PROTECTED]]
  
  
  
  1.24  +2 -2  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ab.c  1999/04/22 11:01:53 1.23
  +++ ab.c  1999/04/22 11:06:48 1.24
  @@ -651,9 +651,9 @@
 * terminator */
int tocopy = (space  r) ? space : r;
   #ifndef CHARSET_EBCDIC
  - memcpy(c-cbuff + c-cbx, buffer, space);
  + memcpy(c-cbuff + c-cbx, buffer, tocopy);
   #else/* CHARSET_EBCDIC */
  - ascii2ebcdic(c-cbuff + c-cbx, buffer, space);
  + ascii2ebcdic(c-cbuff + c-cbx, buffer, tocopy);
   #endif   /* CHARSET_EBCDIC */
c-cbx += tocopy;
space -= tocopy;

cvs commit: apache-1.3/src/support ab.c

1999-04-20 Thread dirkx

dirkx   99/04/20 05:03:29

  Modified:src/support ab.c
  Log:
  Following the change in
  
   1.159 +4 -0  apache-1.3/src/main/util.c
  
  UUencode in ab has also been updated. Though I seriously doubt
  if ab has ever been tested in an EBCDIC environment :-) Does it
  actually work Martin ?
  
  Dw.
  
  Revision  ChangesPath
  1.22  +34 -12apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ab.c  1999/04/05 13:52:21 1.21
  +++ ab.c  1999/04/20 12:03:29 1.22
  @@ -248,20 +248,42 @@
   char *p;
   char *encoded = (char *) malloc((len + 2) / 3 * 4 + 1);
   p = encoded;
  -for (i = 0; i  len; i += 3) {
  - *p++ = basis_64[string[i]  2];
  - *p++ = basis_64[((string[i]  0x3)  4) |
  - ((int) (string[i + 1]  0xF0)  4)];
  - *p++ = basis_64[((string[i + 1]  0xF)  2) |
  - ((int) (string[i + 2]  0xC0)  6)];
  - *p++ = basis_64[string[i + 2]  0x3F];
  -};
  -*p-- = '\0';
  -*p-- = '=';
  -*p-- = '=';
  +#ifndef CHARSET_EBCDIC
  +for (i = 0; i  len-2; i += 3) {
  +*p++ = basis_64[(string[i]  2)  0x3F];
  +*p++ = basis_64[((string[i]  0x3)  4) | ((int) (string[i + 1]  
0xF0)  4)];
  +*p++ = basis_64[((string[i + 1]  0xF)  2) | ((int) (string[i + 2] 
 0xC0)  6)];
  +*p++ = basis_64[string[i + 2]  0x3F];
  +}
  +if (i  len) {
  +*p++ = basis_64[(string[i]  2)  0x3F];
  +*p++ = basis_64[((string[i]  0x3)  4) | ((int) (string[i + 1]  
0xF0)  4)];
  +if (i == (len-2))
  +   *p++ = basis_64[((string[i + 1]  0xF)  2)];
  +else
  +   *p++ = '=';
  +*p++ = '=';
  +}
  +#else /*CHARSET_EBCDIC*/
  +for (i = 0; i  len-2; i += 3) {
  +*p++ = basis_64[(os_toascii[string[i]]  2)  0x3F];
  +*p++ = basis_64[((os_toascii[string[i]]  0x3)  4) | ((int) 
(os_toascii[string[i + 1]]  0xF0)  4)];
  +*p++ = basis_64[((os_toascii[string[i + 1]]  0xF)  2) | ((int) 
(os_toascii[string[i + 2]]  0xC0)  6)];
  +*p++ = basis_64[os_toascii[string[i + 2]]  0x3F];
  +}
  +if (i  len) {
  +   *p++ = basis_64[(os_toascii[string[i]]  2)  0x3F];
  +   *p++ = basis_64[((os_toascii[string[i]]  0x3)  4) | ((int) 
(os_toascii[string[i + 1]]  0xF0)  4)];
  +   if (i == (len-2))
  +   *p++ = basis_64[((os_toascii[string[i + 1]]  0xF)  2)];
  +   else
  +   *p++ = '=';
  +   *p++ = '=';
  +}
  +#endif /*CHARSET_EBCDIC*/
  +*p = '\0';
   return encoded;
   }
  -
   
   /* - */

cvs commit: apache-1.3/src/support ab.c

1999-02-16 Thread martin

martin  99/02/16 07:05:41

  Modified:src/support ab.c
  Log:
  Allow running ab with HTML output generation.
  
  Submitted by: David N. Welton [EMAIL PROTECTED]
  Reviewed by: Martin Kraemer
  
  Revision  ChangesPath
  1.19  +110 -11   apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ab.c  1999/01/04 04:13:13 1.18
  +++ ab.c  1999/02/16 15:05:38 1.19
  @@ -80,6 +80,7 @@
   **- Enhanced by Dean Gaudet [EMAIL PROTECTED], November 1997
   **- Cleaned up by Ralf S. Engelschall [EMAIL PROTECTED], March 1998 
   **- POST and verbosity by Kurt Sussman [EMAIL PROTECTED], August 1998 
  +**- HTML table output added by David N. Welton [EMAIL PROTECTED], 
January 1999
   **
   */
   
  @@ -95,7 +96,7 @@
*   only an issue for loopback usage
*/
   
  -#define VERSION 1.2
  +#define VERSION 1.3
   
   /*   */
   
  @@ -174,7 +175,8 @@
   int postlen = 0;/* length of data to be POSTed */
   char content_type[1024];/* content type to put in POST header */
   int port = 80;  /* port number */
  -
  +int use_html = 0;/* use html in the report */
  + 
   int doclen = 0; /* the length the document should be */
   int totalread = 0;  /* total number of bytes read */
   int totalbread = 0; /* totoal amount of entity body read */
  @@ -338,9 +340,88 @@
   }
   
   /* - */
  +
  +/* calculate and output results in HTML  */ 
  +
  +static void output_html_results(void)
  +{
  +int timetaken;
  +
  +gettimeofday(endtime, 0);
  +timetaken = timedif(endtime, start);
  +
  +printf(\n\ntable\n);
  +printf(trthServer Software:/thtd%s/td/tr\n, 
servername);
  +printf(trthServer Hostname:/thtd%s/td/tr\n, hostname);
  +printf(trthServer Port:/thtd%d/td/tr\n, 
port);
  +printf(trth/thtd/td/tr\n);
  +printf(trthDocument Path:/th  td%s/td/tr\n, 
path);
  +printf(trthDocument Length:/thtd%d bytes/td/tr\n, 
doclen);
  +printf(trth/thtd/td/tr\n);
  +printf(trthConcurrency Level:/th  td%d/td/tr\n, 
concurrency);
  +printf(trthTime taken for tests:/th   td%d.%03d 
seconds/td/tr\n,
  +   timetaken / 1000, timetaken % 1000);
  +printf(trthComplete requests:/th  td%d/td/tr\n, done);
  +printf(trthFailed requests:/thtd%d/td/tr\n, bad);
  +if (bad)
  +printf(trtd colspan=3   (Connect: %d, Length: %d, Exceptions: 
%d)/td/tr\n,
  +   err_conn, err_length, err_except);
  +if (err_response)
  +printf(trthNon-2xx responses:/th  td%d/td/tr\n, 
err_response);
  +if (keepalive)
  +printf(trthKeep-Alive requests:/thtd%d/td/tr\n, 
doneka);
  +printf(trthTotal transferred:/th  td%d bytes/td/tr\n, 
totalread);
  +if (posting)
  +printf(trthTotal POSTed:/th   td%d/td/tr\n, 
totalposted);
  +printf(trthHTML transferred:/th   td%d bytes/td/tr\n, 
totalbread);
   
  -/* start asynchronous non-blocking connection */
  +/* avoid divide by zero */
  +if (timetaken) {
  +printf(trthRequests per second:/thtd%.2f/td/tr\n, 
1000 * (float) (done) / timetaken);
  +printf(trthTransfer rate:/th  td%.2f kb/s 
received/td/tr\n, (float) (totalread) / timetaken);
  +if (posting) {
  +printf(trtd/tdtd%.2f kb/s sent/td/tr\n, 
  + (float)(totalposted)/timetaken);
  +printf(trtd/tdtd%.2f kb/s total/td/tr\n, 
  + (float)(totalread + totalposted)/timetaken);
  +}
  +}
  +printf(/table\n);
   
  +{
  +/* work out connection times */
  +int i;
  +int totalcon = 0, total = 0;
  +int mincon = 999, mintot = 99;
  +int maxcon = 0, maxtot = 0;
  +
  +for (i = 0; i  requests; i++) {
  +struct data s = stats[i];
  + mincon = ap_min(mincon, s.ctime);
  + mintot = ap_min(mintot, s.time);
  + maxcon = ap_max(maxcon, s.ctime);
  + maxtot = ap_max(maxtot, s.time);
  +totalcon += s.ctime;
  +total += s.time;
  +}
  + printf(table\n);
  +printf(trth colspan=4Connnection Times (ms)/th/tr\n);
  +printf(trth/th thmin/th   thavg/th   
thmax/th/tr\n);
  +printf(trthConnect:/thtd%5d/td td%5d/td 
td%5d/td/tr\n, 
  +mincon, totalcon / requests, maxcon);
  +printf(trthProcessing:/th td%5d/td td%5d/td 
td%5d/td/tr\n, 
  +mintot - mincon, (total/requests) - (totalcon/requests),
  +maxtot - maxcon);
  +

cvs commit: apache-1.3/src/support ab.c

1999-01-04 Thread randy

randy   99/01/03 20:13:14

  Modified:src  Configure
  Log:
  Portability fixes for QNX32. This may also apply to QNX, but I cannot
  verify that. /bin/sh is pathetic on this platform so configuration
  still requires a replacement shell.
  
  Revision  ChangesPath
  1.319 +1 -0  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.318
  retrieving revision 1.319
  diff -u -r1.318 -r1.319
  --- Configure 1999/01/02 23:54:34 1.318
  +++ Configure 1999/01/04 04:11:38 1.319
  @@ -497,6 +497,7 @@
DEF_WANTHSREGEX=yes
;;
   *-qnx32)
  +CC='cc -F'
OS='QNX32'
CFLAGS=$CFLAGS -DQNX -mf -3
LIBS=$LIBS -N128k -lsocket -lunix
  
  
  

  Modified:src/support ab.c
  Log:
  Portability fixes for QNX32. This change seems to be the most
  portable way to handle the conflict with this macro in other
  included files.
  
  Revision  ChangesPath
  1.18  +6 -6  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ab.c  1999/01/01 19:05:32 1.17
  +++ ab.c  1999/01/04 04:13:13 1.18
  @@ -155,8 +155,8 @@
   int time;   /* time in ms for connection */
   };
   
  -#define min(a,b) ((a)(b))?(a):(b)
  -#define max(a,b) ((a)(b))?(a):(b)
  +#define ap_min(a,b) ((a)(b))?(a):(b)
  +#define ap_max(a,b) ((a)(b))?(a):(b)
   
   /* - GLOBALS  */
   
  @@ -320,10 +320,10 @@
   
   for (i = 0; i  requests; i++) {
   struct data s = stats[i];
  -mincon = min(mincon, s.ctime);
  -mintot = min(mintot, s.time);
  -maxcon = max(maxcon, s.ctime);
  -maxtot = max(maxtot, s.time);
  +mincon = ap_min(mincon, s.ctime);
  +mintot = ap_min(mintot, s.time);
  +maxcon = ap_max(maxcon, s.ctime);
  +maxtot = ap_max(maxtot, s.time);
   totalcon += s.ctime;
   total += s.time;
   }

cvs commit: apache-1.3/src/support ab.c

1998-11-15 Thread rse

rse 98/11/15 07:54:41

  Modified:src/support ab.c
  Log:
  Fix a comment while poking around in this source...
  
  Revision  ChangesPath
  1.16  +1 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ab.c  1998/09/04 20:48:44 1.15
  +++ ab.c  1998/11/15 15:54:41 1.16
  @@ -339,7 +339,7 @@
   
   /* - */
   
  -/* start asnchronous non-blocking connection */
  +/* start asynchronous non-blocking connection */
   
   static void start_connect(struct connection *c)
   {

cvs commit: apache-1.3/src/support ab.c

1998-09-04 Thread martin

martin  98/09/04 13:48:45

  Modified:src/support ab.c
  Log:
  Fix default generation of Content-Type: header for POST requests
  
  Revision  ChangesPath
  1.15  +1 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ab.c  1998/08/25 09:22:14 1.14
  +++ ab.c  1998/09/04 20:48:44 1.15
  @@ -623,7 +623,7 @@
VERSION,
keepalive ? Connection: Keep-Alive\r\n : , 
hostname, postlen, 
  - (content_type) ? content_type : text/plain);
  + (content_type[0]) ? content_type : text/plain);
   }
   
   if (verbosity = 2) printf(INFO: POST header == \n---\n%s\n---\n, 
request);

cvs commit: apache-1.3/src/support ab.c

1998-08-25 Thread rse

rse 98/08/25 02:22:14

  Modified:src  CHANGES
   src/support ab.c
  Log:
  Make ab.c again pass ``gcc -Wall -Wshadow -Wpointer-arith -Wcast-align
  -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline''
  without complains after we recently added the POST feature.
  
  Revision  ChangesPath
  1.1034+5 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1033
  retrieving revision 1.1034
  diff -u -r1.1033 -r1.1034
  --- CHANGES   1998/08/25 09:15:26 1.1033
  +++ CHANGES   1998/08/25 09:22:12 1.1034
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.2
   
  +  *) Make ab.c again pass ``gcc -Wall -Wshadow -Wpointer-arith -Wcast-align
  + -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline''
  + without complains after we recently added the POST feature.
  + [Ralf S. Engelschall]
  +
 *) Renamed is_HTTP_xxx() macros to ap_is_HTTP_xxx() name. They are used 
inside
modules as API functions and we forgot them at the big symbol renaming.
[Ralf S. Engelschall]
  
  
  
  1.14  +1 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ab.c  1998/08/20 04:11:33 1.13
  +++ ab.c  1998/08/25 09:22:14 1.14
  @@ -741,7 +741,7 @@
   
   /* read data to POST from file, save contents and length */
   
  -int open_postfile(char *pfile)
  +static int open_postfile(char *pfile)
   {
   int postfd, status;
   struct stat postfilestat;

cvs commit: apache-1.3/src/support ab.c

1998-08-20 Thread dgaudet

dgaudet 98/08/19 21:11:34

  Modified:src/support ab.c
  Log:
  note a few bugs
  
  Revision  ChangesPath
  1.13  +13 -1 apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ab.c  1998/08/20 04:07:45 1.12
  +++ ab.c  1998/08/20 04:11:33 1.13
  @@ -83,6 +83,18 @@
   **
   */
   
  +/*
  + * BUGS:
  + *
  + * - uses strcpy/etc.
  + * - has various other poor buffer attacks related to the lazy parsing of
  + *   response headers from the server
  + * - doesn't implement much of HTTP/1.x, only accepts certain forms of
  + *   responses
  + * - (performance problem) heavy use of strstr shows up top in profile
  + *   only an issue for loopback usage
  + */
  +
   #define VERSION 1.2
   
   /*   */
  @@ -480,7 +492,7 @@
   *q = 0;
   }
   
  - /* FIXME: this parsing isn't even remotely HTTP compliant...
  + /* XXX: this parsing isn't even remotely HTTP compliant...
 * but in the interest of speed it doesn't totally have to be,
 * it just needs to be extended to handle whatever servers
 * folks want to test against. -djg */

cvs commit: apache-1.3/src/support ab.c

1998-07-29 Thread martin

martin  98/07/29 03:14:41

  Modified:src/support ab.c
  Log:
  Added EBCDIC support to ApacheBench
  
  Revision  ChangesPath
  1.11  +8 -0  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- ab.c  1998/07/15 18:33:12 1.10
  +++ ab.c  1998/07/29 10:14:40 1.11
  @@ -382,7 +382,11 @@
   int l = 4;
   int space = CBUFFSIZE - c-cbx - 1; /* -1 to allow for 0 
terminator */
   int tocopy = (space  r) ? space : r;
  +#ifndef CHARSET_EBCDIC
   memcpy(c-cbuff + c-cbx, buffer, space);
  +#else /*CHARSET_EBCDIC*/
  +ascii2ebcdic(c-cbuff + c-cbx, buffer, space);
  +#endif /*CHARSET_EBCDIC*/
   c-cbx += tocopy;
   space -= tocopy;
   c-cbuff[c-cbx] = 0;   /* terminate for benefit of strstr */
  @@ -526,6 +530,10 @@
hostname);
   
   reqlen = strlen(request);
  +
  +#ifdef CHARSET_EBCDIC
  +ebcdic2ascii(request, request, reqlen);
  +#endif /*CHARSET_EBCDIC*/
   
   /* ok - lets start */
   gettimeofday(start, 0);

cvs commit: apache-1.3/src/support ab.c

1998-07-15 Thread marc

marc98/07/15 11:33:13

  Modified:src/support ab.c
  Log:
  Use ap_select instead of select in ab, and replace hardcoded 256 with
  FD_SETSIZE.  Should really dynamically track the highest descriptor
  and use that.
  
  PR: 2625
  Submitted by: Richard Lloyd [EMAIL PROTECTED], Marc Slemko
  
  Revision  ChangesPath
  1.10  +1 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ab.c  1998/07/13 11:32:57 1.9
  +++ ab.c  1998/07/15 18:33:12 1.10
  @@ -551,7 +551,7 @@
   /* Timeout of 30 seconds. */
   timeout.tv_sec = 30;
   timeout.tv_usec = 0;
  -n = select(256, sel_read, sel_write, sel_except, timeout);
  +n = ap_select(FD_SETSIZE, sel_read, sel_write, sel_except, 
timeout);
   if (!n) {
   printf(\nServer timed out\n\n);
   exit(1);

cvs commit: apache-1.3/src/support ab.c

1998-06-09 Thread martin

martin  98/06/09 14:02:14

  Modified:src/support ab.c
  Log:
  Fix typos from zb era
  
  Revision  ChangesPath
  1.8   +4 -4  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -u -r1.7 -r1.8
  --- ab.c  1998/04/21 20:14:05 1.7
  +++ ab.c  1998/06/09 21:02:13 1.8
  @@ -231,7 +231,7 @@
   printf(Document Path:  %s\n, path);
   printf(Document Length:%d bytes\n, doclen);
   printf(\n);
  -printf(Concurency Level:   %d\n, concurrency);
  +printf(Concurrency Level:  %d\n, concurrency);
   printf(Time taken for tests:   %d.%03d seconds\n,
  timetaken / 1000, timetaken % 1000);
   printf(Complete requests:  %d\n, done);
  @@ -241,12 +241,12 @@
  err_conn, err_length, err_except);
   if (keepalive)
   printf(Keep-Alive requests:%d\n, doneka);
  -printf(Total transfered:   %d bytes\n, totalread);
  -printf(HTML transfered:%d bytes\n, totalbread);
  +printf(Total transferred:  %d bytes\n, totalread);
  +printf(HTML transferred:   %d bytes\n, totalbread);
   
   /* avoid divide by zero */
   if (timetaken) {
  -printf(Requests per seconds:   %.2f\n, 1000 * (float) (done) / 
timetaken);
  +printf(Requests per second:%.2f\n, 1000 * (float) (done) / 
timetaken);
   printf(Transfer rate:  %.2f kb/s\n,
  (float) (totalread) / timetaken);
   }

cvs commit: apache-1.3/src/support ab.c

1998-04-21 Thread jim

jim 98/04/20 18:41:57

  Modified:src/support ab.c
  Log:
  PR: 2081
  Obtained from: Jens Schleusener [EMAIL PROTECTED]
  Submitted by: Jim Jagielski
  AIX requires sys/select.h
  
  Revision  ChangesPath
  1.5   +3 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ab.c  1998/03/31 12:53:45 1.4
  +++ ab.c  1998/04/21 01:41:57 1.5
  @@ -99,8 +99,10 @@
   #include sys/time.h
   #include sys/ioctl.h
   #include sys/socket.h
  -#include sys/ioctl.h
   #include netinet/in.h
  +#ifdef AIX
  +#include sys/select.h
  +#endif
   
   /* --- DEFINITIONS -- */

cvs commit: apache-1.3/src/support ab.c

1998-04-21 Thread jim

jim 98/04/21 12:56:28

  Modified:src/support ab.c
  Log:
  Have ab.c use our ./include/conf.h file to pull
  out (hopefully) the right header files
  
  Revision  ChangesPath
  1.6   +1 -9  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ab.c  1998/04/21 01:41:57 1.5
  +++ ab.c  1998/04/21 19:56:27 1.6
  @@ -89,20 +89,12 @@
   /* affects include files on Solaris */
   #define BSD_COMP
   
  -#include stdio.h
  -#include stdlib.h
  +#include conf.h
   #include string.h
   #include errno.h
   #include fcntl.h
   #include unistd.h
  -#include netdb.h
   #include sys/time.h
  -#include sys/ioctl.h
  -#include sys/socket.h
  -#include netinet/in.h
  -#ifdef AIX
  -#include sys/select.h
  -#endif
   
   /* --- DEFINITIONS -- */

cvs commit: apache-1.3/src/support ab.c htdigest.c htpasswd.c logresolve.c rotatelogs.c suexec.c

1998-04-21 Thread jim

jim 98/04/21 13:14:08

  Modified:src/support ab.c htdigest.c htpasswd.c logresolve.c
rotatelogs.c suexec.c
  Log:
  Adjust ALL *.c files in support to use conf.h
  so we get the right header files, etc...
  
  Revision  ChangesPath
  1.7   +0 -3  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ab.c  1998/04/21 19:56:27 1.6
  +++ ab.c  1998/04/21 20:14:05 1.7
  @@ -90,10 +90,7 @@
   #define BSD_COMP
   
   #include conf.h
  -#include string.h
  -#include errno.h
   #include fcntl.h
  -#include unistd.h
   #include sys/time.h
   
   /* --- DEFINITIONS -- */
  
  
  
  1.17  +1 -5  apache-1.3/src/support/htdigest.c
  
  Index: htdigest.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/htdigest.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- htdigest.c1998/04/11 12:01:08 1.16
  +++ htdigest.c1998/04/21 20:14:05 1.17
  @@ -10,17 +10,13 @@
* by Alexei Kosut, based on htpasswd.c, by Rob McCool
*/
   
  +#include conf.h
   #include sys/types.h
  -#include stdio.h
  -#include string.h
   #ifdef MPE
   #include signal.h
   #else
   #include sys/signal.h
   #endif
  -#include stdlib.h
  -#include time.h
  -#include unistd.h
   
   /* This is probably the easiest way to do it */
   #include ../main/md5c.c
  
  
  
  1.15  +1 -5  apache-1.3/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- htpasswd.c1998/03/19 09:56:42 1.14
  +++ htpasswd.c1998/04/21 20:14:06 1.15
  @@ -10,13 +10,9 @@
* Rob McCool
*/
   
  +#include conf.h
   #include sys/types.h
  -#include stdio.h
  -#include string.h
   #include signal.h
  -#include stdlib.h
  -#include time.h
  -#include unistd.h
   
   #ifndef CHARSET_EBCDIC
   #define LF 10
  
  
  
  1.12  +0 -1  apache-1.3/src/support/logresolve.c
  
  Index: logresolve.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- logresolve.c  1998/04/21 20:03:23 1.11
  +++ logresolve.c  1998/04/21 20:14:06 1.12
  @@ -43,7 +43,6 @@
   #include sys/types.h
   
   #include ctype.h
  -#include string.h
   
   #ifndef MPE
   #include arpa/inet.h
  
  
  
  1.9   +1 -3  apache-1.3/src/support/rotatelogs.c
  
  Index: rotatelogs.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/rotatelogs.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- rotatelogs.c  1997/10/12 06:00:48 1.8
  +++ rotatelogs.c  1998/04/21 20:14:06 1.9
  @@ -10,12 +10,10 @@
   #define BUFSIZE  65536
   #define MAX_PATH 1024
   
  -#include stdio.h
  -#include stdlib.h
  +#include conf.h
   #include time.h
   #include errno.h
   #include fcntl.h
  -#include unistd.h
   
   int main (int argc, char **argv)
   {
  
  
  
  1.38  +2 -10 apache-1.3/src/support/suexec.c
  
  Index: suexec.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/suexec.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- suexec.c  1998/03/31 12:54:06 1.37
  +++ suexec.c  1998/04/21 20:14:06 1.38
  @@ -71,20 +71,12 @@
*
*/
   
  -
  +#include conf.h
   #include sys/param.h
   #include sys/stat.h
   #include sys/types.h
   
  -#include errno.h
  -#include grp.h
  -#include pwd.h
   #include stdarg.h
  -#include stdio.h
  -#include stdlib.h
  -#include string.h
  -#include time.h
  -#include unistd.h
   
   #include suexec.h
   
  @@ -98,7 +90,7 @@
***
*/
   
  -#if defined(QNX) || defined(_OSD_POSIX) || defined(MPE) || defined(SCO) || 
defined(BEOS)
  +#if defined(NEED_INITGROUPS)
   int initgroups(const char *name, gid_t basegid)
   {
   /* QNX and MPE do not appear to support supplementary groups. */

cvs commit: apache-1.3/src/support ab.c

1998-03-22 Thread marc

marc98/03/21 17:31:50

  Modified:src/support ab.c
  Log:
  Only need one break.
  
  Revision  ChangesPath
  1.3   +0 -1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ab.c  1998/03/19 09:56:41 1.2
  +++ ab.c  1998/03/22 01:31:49 1.3
  @@ -660,7 +660,6 @@
   case 'c':
   concurrency = atoi(optarg);
   break;
  -break;
   case 't':
   tlimit = atoi(optarg);
   requests = MAX_REQUESTS;/* need to size data array on 
something */

cvs commit: apache-1.3/src/support ab.c htpasswd.c htdigest.c suexec.c

1998-03-19 Thread Ralf S. Engelschall

rse 98/03/19 01:56:45

  Modified:src/support ab.c htpasswd.c htdigest.c suexec.c
  Log:
  Also static stuff for the support files to make
  `gcc -Wall -Wshadow -Wmissing-prototypes -Wmissing-declarations'
  also happy for those sources.
  
  Revision  ChangesPath
  1.2   +11 -12apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ab.c  1998/03/17 12:46:41 1.1
  +++ ab.c  1998/03/19 09:56:41 1.2
  @@ -183,7 +183,7 @@
   /* write out request to a connection - assumes we can write 
  (small) request out in one go into our new socket buffer  */
   
  -void write_request(struct connection *c)
  +static void write_request(struct connection *c)
   {
   gettimeofday(c-connect, 0);
   write(c-fd, request, reqlen);
  @@ -196,7 +196,7 @@
   
   /* make an fd non blocking */
   
  -void nonblock(int fd)
  +static void nonblock(int fd)
   {
   int i = 1;
   ioctl(fd, FIONBIO, i);
  @@ -206,7 +206,7 @@
   
   /* returns the time in ms between two timevals */
   
  -int timedif(struct timeval a, struct timeval b)
  +static int timedif(struct timeval a, struct timeval b)
   {
   register int us, s;
   
  @@ -221,7 +221,7 @@
   
   /* calculate and output results and exit */
   
  -void output_results()
  +static void output_results(void)
   {
   int timetaken;
   
  @@ -285,7 +285,7 @@
   
   /* start asnchronous non-blocking connection */
   
  -void start_connect(struct connection *c)
  +static void start_connect(struct connection *c)
   {
   c-read = 0;
   c-bread = 0;
  @@ -325,7 +325,7 @@
   
   /* close down connection and save stats */
   
  -void close_connection(struct connection *c)
  +static void close_connection(struct connection *c)
   {
   if (c-read == 0  c-keepalive) {
   /* server has legitiamately shut down an idle keep alive request */
  @@ -365,7 +365,7 @@
   
   /* read data from connection */
   
  -void read_connection(struct connection *c)
  +static void read_connection(struct connection *c)
   {
   int r;
   
  @@ -490,7 +490,7 @@
   
   /* run the tests */
   
  -int test()
  +static void test(void)
   {
   struct timeval timeout, now;
   fd_set sel_read, sel_except, sel_write;
  @@ -580,13 +580,12 @@
   if (done = requests)
   output_results();
   }
  -return 0;
   }
   
   /* --- */
   
   /* display copyright information */
  -void copyright(void) 
  +static void copyright(void) 
   {
   printf(This is ApacheBench, Version %s\n, VERSION);
   printf(Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, 
http://www.zeustech.net/\n;);
  @@ -595,7 +594,7 @@
   }
   
   /* display usage information */
  -void usage(char *progname)
  +static void usage(char *progname)
   {
   fprintf(stderr, Usage: %s [options] [http://]hostname[:port]/path\n;, 
progname);
   fprintf(stderr, Options are:\n);
  @@ -612,7 +611,7 @@
   
   /* split URL into parts */
   
  -int parse_url(char *url)
  +static int parse_url(char *url)
   {
   char *cp;
   char *h;
  
  
  
  1.14  +9 -9  apache-1.3/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- htpasswd.c1998/03/18 00:58:34 1.13
  +++ htpasswd.c1998/03/19 09:56:42 1.14
  @@ -30,7 +30,7 @@
   
   char *tn;
   
  -char *strd(char *s)
  +static char *strd(char *s)
   {
   char *d;
   
  @@ -39,7 +39,7 @@
   return (d);
   }
   
  -void getword(char *word, char *line, char stop)
  +static void getword(char *word, char *line, char stop)
   {
   int x = 0, y;
   
  @@ -54,7 +54,7 @@
   while ((line[y++] = line[x++]));
   }
   
  -int getline(char *s, int n, FILE *f)
  +static int getline(char *s, int n, FILE *f)
   {
   register int i = 0;
   
  @@ -72,7 +72,7 @@
   }
   }
   
  -void putline(FILE *f, char *l)
  +static void putline(FILE *f, char *l)
   {
   int x;
   
  @@ -86,7 +86,7 @@
   static unsigned char itoa64[] =  /* 0 ... 63 = ascii - 64 */
   ./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz;
   
  -void to64(register char *s, register long v, register int n)
  +static void to64(register char *s, register long v, register int n)
   {
   while (--n = 0) {
*s++ = itoa64[v  0x3f];
  @@ -99,7 +99,7 @@
* issue the prompt and read the results with echo.  (Ugh).
*/
   
  -char *getpass(const char *prompt)
  +static char *getpass(const char *prompt)
   {
   
   static char password[81];
  @@ -116,7 +116,7 @@
   
   #endif
   
  -void add_password(char *user,

cvs commit: apache-1.3/src/support ab.c ab.1 Makefile.tmpl

1998-03-17 Thread Ralf S. Engelschall

rse 98/03/17 04:46:42

  Modified:.STATUS
   src  CHANGES
   src/support Makefile.tmpl
  Added:   src/support ab.c ab.1
  Log:
  Include of the new ApacheBench support program:
  
o base is ZeusBench 1.0 from Adam Twiss, Zeus Technology Ltd.
  
o includes enhancements by Dean from November 1997 for keepalive, SunOS4,
  etc. pp. which were already committed to src/test/zb.c
  
o cleanups and enhancements by Ralf from March 1998: command line
  parsing, new options, URL-like target specification, manual page,
  Apache-style code indentation, etc.
  
o !!IMPORTANT!! personal license agreement from March 1998 with Adam Twiss
  from Zeus Technology (see message
  [EMAIL PROTECTED] in apache-core mailing list
  for reference) to include this version into the Apache distribution the
  way it currently is. So, don't change copyright messages or other
  license stuff there, please. The program itself can now be enhanced or
  changed in any way.
  
  Revision  ChangesPath
  1.194 +1 -0  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.193
  retrieving revision 1.194
  diff -u -r1.193 -r1.194
  --- STATUS1998/03/17 09:59:30 1.193
  +++ STATUS1998/03/17 12:46:36 1.194
  @@ -93,6 +93,7 @@
   * Ralf's Various cleanups to the command line interface and manual pages
   * Marc's mod_proxy was not clearing the Proxy-Connection header
   * Dean's API_EXPORT and CORE_EXPORT cleanup for core functions
  +* Ralf's new ApacheBench support program (src/support/ab.c)
   
   Available Patches:
   
  
  
  
  1.719 +7 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.718
  retrieving revision 1.719
  diff -u -r1.718 -r1.719
  --- CHANGES   1998/03/17 08:31:00 1.718
  +++ CHANGES   1998/03/17 12:46:38 1.719
  @@ -1,5 +1,12 @@
   Changes with Apache 1.3b6
   
  +  *) Add the new ApacheBench program ab to src/support/: This is derived
  + from the ZeusBench benchmarking program and can be used to determine the
  + response performance of an Apache installation. This version is
  + officially licensed with Zeus Technology, Ltd. See the license agreement
  + statements in [EMAIL PROTECTED] in apache-core.
  + [Ralf S. Engelschall]
  +
 *) API: Various core functions that are definately not part of the API
have been made static, and a few have been marked API_EXPORT.  Still
more have been marked CORE_EXPORT and are not intended for general
  
  
  
  1.11  +5 -2  apache-1.3/src/support/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/Makefile.tmpl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.tmpl 1998/03/13 08:15:26 1.10
  +++ Makefile.tmpl 1998/03/17 12:46:41 1.11
  @@ -9,9 +9,9 @@
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L../ap
   INCDIR=../include
   
  -TARGETS=htpasswd htdigest rotatelogs logresolve
  +TARGETS=htpasswd htdigest rotatelogs logresolve ab
   
  -OBJS=htpasswd.o htdigest.o rotatelogs.o logresolve.o
  +OBJS=htpasswd.o htdigest.o rotatelogs.o logresolve.o ab.o
   
   .c.o: 
$(CC) -c $(CFLAGS) $(INCLUDES) $
  @@ -29,6 +29,9 @@
   
   logresolve: logresolve.o
$(CC) $(INCLUDES) $(CFLAGS) logresolve.o -o logresolve $(LDFLAGS) 
$(LIBS)
  +
  +ab: ab.o
  + $(CC) $(INCLUDES) $(CFLAGS) ab.o -o ab $(LDFLAGS) $(LIBS)
   
   clean:
rm -f $(TARGETS) *.o
  
  
  
  1.1  apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===
  /* 
   * Copyright (c) 1998 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *software must display the following acknowledgment:
   *This product includes software developed by the Apache Group
   *for use in the Apache HTTP server project (http://www.apache.org/).
   *

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c ab.8

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c htdigest.c htpasswd.c logresolve.c rotatelogs.c suexec.c

cvs commit: apache-1.3/src/support ab.c

cvs commit: apache-1.3/src/support ab.c htpasswd.c htdigest.c suexec.c

cvs commit: apache-1.3/src/support ab.c ab.1 Makefile.tmpl

30 matches

Site Navigation

Mail list logo

Footer information