httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Ralf S. Engelschall" <...@engelschall.com>
Subject DIFF apache-1.3 before and after crash!
Date Fri, 21 Aug 1998 08:11:09 GMT

I've moved at least the apache-1.3 repository to apache-1.3.OK and then run
CVSup to sync with the backuped apache-1.3 which is now active after the
crash. The below is a diff -ru3 between the two directories. The additional
newlines confuse me totally...

                                       Ralf S. Engelschall
                                       rse@engelschall.com
                                       www.engelschall.com

diff -ru3 apache-1.3.OK/.cvsignore,v apache-1.3/.cvsignore,v
--- apache-1.3.OK/.cvsignore,v	Sun Jul 19 00:58:02 1998
+++ apache-1.3/.cvsignore,v	Sun Jul 19 00:58:02 1998
@@ -113,3 +113,5 @@
 text
 @d2 2
 @
+
+
diff -ru3 apache-1.3.OK/Announcement,v apache-1.3/Announcement,v
--- apache-1.3.OK/Announcement,v	Sun Jul 19 00:58:02 1998
+++ apache-1.3/Announcement,v	Sun Jul 19 00:58:02 1998
@@ -1309,3 +1309,5 @@
 binaries. It is anticipated that a binary-release will be available for
 1.3b3.
 @
+
+
Only in apache-1.3/Attic: test.txt,v
diff -ru3 apache-1.3.OK/INSTALL,v apache-1.3/INSTALL,v
--- apache-1.3.OK/INSTALL,v	Sat Jul 25 10:13:16 1998
+++ apache-1.3/INSTALL,v	Sat Jul 25 10:13:16 1998
@@ -1642,3 +1642,5 @@
                                                       [--suexec-userdir=DIR]
 d158 5
 @
+
+
diff -ru3 apache-1.3.OK/Makefile.tmpl,v apache-1.3/Makefile.tmpl,v
--- apache-1.3.OK/Makefile.tmpl,v	Wed Aug 12 13:33:37 1998
+++ apache-1.3/Makefile.tmpl,v	Wed Aug 12 13:33:37 1998
@@ -2151,3 +2151,5 @@
 a219 1
 				modpath="$(libexecdir)/$$file" >>.install.conf; \
 @
+
+
diff -ru3 apache-1.3.OK/README.configure,v apache-1.3/README.configure,v
--- apache-1.3.OK/README.configure,v	Sun Jul 19 00:58:03 1998
+++ apache-1.3/README.configure,v	Sun Jul 19 00:58:03 1998
@@ -668,3 +668,5 @@
 a245 1
                   --activate-module=src/modules/extra/mod_php3.c
 @
+
+
diff -ru3 apache-1.3.OK/STATUS,v apache-1.3/STATUS,v
--- apache-1.3.OK/STATUS,v	Sun Aug 16 06:00:08 1998
+++ apache-1.3/STATUS,v	Sun Aug 16 06:00:08 1998
@@ -11778,3 +11778,5 @@
 text
 @d45 4
 @
+
+
diff -ru3 apache-1.3.OK/conf/highperformance.conf-dist,v apache-1.3/conf/highperformance.conf-dist,v
--- apache-1.3.OK/conf/highperformance.conf-dist,v	Sun Jul 19 00:58:04 1998
+++ apache-1.3/conf/highperformance.conf-dist,v	Sun Jul 19 00:58:04 1998
@@ -84,3 +84,5 @@
 
 # OK that's enough hints.  Read the documentation if you want more.
 @
+
+
diff -ru3 apache-1.3.OK/conf/magic,v apache-1.3/conf/magic,v
--- apache-1.3.OK/conf/magic,v	Sun Jul 19 00:58:04 1998
+++ apache-1.3/conf/magic,v	Sun Jul 19 00:58:04 1998
@@ -447,3 +447,4 @@
 @d173 1
 d175 2
 @
+
diff -ru3 apache-1.3.OK/conf/mime.types,v apache-1.3/conf/mime.types,v
--- apache-1.3.OK/conf/mime.types,v	Mon Aug  3 09:18:34 1998
+++ apache-1.3/conf/mime.types,v	Fri Aug 21 05:13:35 1998
@@ -1,4 +1,4 @@
-head	1.14;
+head	1.15;
 access;
 symbols
 	APACHE_1_3_1:1.12
@@ -48,6 +48,11 @@
 comment	@# @;
 
 
+1.15
+date	98.08.21.03.13.35;	author marc;	state Exp;
+branches;
+next	1.14;
+
 1.14
 date	98.08.03.07.18.33;	author rse;	state Exp;
 branches;
@@ -129,11 +134,16 @@
 @@
 
 
-1.14
+1.15
 log
-@Add correct `model' MIME types from RFC2077 to mime.types file.
+@Fix mime.types file.
 
-PR: 2732
+While I am at it, fix x,y,z --> nicer x, y, and z.
+
+PR:
+Obtained from:
+Submitted by:
+Reviewed by:	Rob McCool
 @
 text
 @# This file controls what MIME types are sent to the client for the
@@ -141,7 +151,7 @@
 # is important so they know how to handle the content of the file.
 # Extra types can either be added here or by using an AddType directive
 # in your config files. For more information about MIME types
-# please read RFC 2045,2046,2047,2048,2077.
+# please read RFC 2045, 2046, 2047, 2048, and 2077.
 
 # MIME type			Extension
 application/activemessage
@@ -244,6 +254,22 @@
 video/x-msvideo			avi
 video/x-sgi-movie		movie
 x-conference/x-cooltalk		ice
+
+# This is a comment. I love comments.
+@
+
+
+1.14
+log
+@Add correct `model' MIME types from RFC2077 to mime.types file.
+
+PR: 2732
+@
+text
+@d6 1
+a6 1
+# please read RFC 2045,2046,2047,2048,2077.
+d109 2
 @
 
 
diff -ru3 apache-1.3.OK/configure,v apache-1.3/configure,v
--- apache-1.3.OK/configure,v	Sat Aug 15 17:02:46 1998
+++ apache-1.3/configure,v	Sat Aug 15 17:02:46 1998
@@ -2715,3 +2715,5 @@
 echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_compile}access.conf\"'" >>$src/apaci
 echo "echo '-DRESOURCE_CONFIG_FILE=\"${sysconfdir_compile}srm.conf\"'" >>$src/apaci
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/.cvsignore,v apache-1.3/htdocs/.cvsignore,v
--- apache-1.3.OK/htdocs/.cvsignore,v	Sun Jul 19 00:58:05 1998
+++ apache-1.3/htdocs/.cvsignore,v	Sun Jul 19 00:58:05 1998
@@ -32,3 +32,5 @@
 text
 @*
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/dso.html,v apache-1.3/htdocs/manual/dso.html,v
--- apache-1.3.OK/htdocs/manual/dso.html,v	Mon Aug  3 10:44:10 1998
+++ apache-1.3/htdocs/manual/dso.html,v	Mon Aug  3 10:44:10 1998
@@ -939,3 +939,4 @@
 
 
 @
+
diff -ru3 apache-1.3.OK/htdocs/manual/ebcdic.html,v apache-1.3/htdocs/manual/ebcdic.html,v
--- apache-1.3.OK/htdocs/manual/ebcdic.html,v	Sun Jul 19 00:58:06 1998
+++ apache-1.3/htdocs/manual/ebcdic.html,v	Sun Jul 19 00:58:06 1998
@@ -785,3 +785,5 @@
 a16 1
 <H1 ALIGN="CENTER">Overview of Apache EBCDIC Port</H1>
 @
+
+
Binary files apache-1.3.OK/htdocs/manual/images/custom_errordocs.gif,v and apache-1.3/htdocs/manual/images/custom_errordocs.gif,v differ
diff -ru3 apache-1.3.OK/htdocs/manual/images/mod_rewrite_fig1.fig,v apache-1.3/htdocs/manual/images/mod_rewrite_fig1.fig,v
--- apache-1.3.OK/htdocs/manual/images/mod_rewrite_fig1.fig,v	Sun Jul 19 00:58:12 1998
+++ apache-1.3/htdocs/manual/images/mod_rewrite_fig1.fig,v	Sun Jul 19 00:58:12 1998
@@ -97,3 +97,5 @@
 4 0 9 0 0 18 12 0.0000 4 135 825 5925 6225 rewritten\001
 4 0 9 0 0 18 12 0.0000 4 135 375 6075 6450 URL\001
 @
+
+
Binary files apache-1.3.OK/htdocs/manual/images/mod_rewrite_fig1.gif,v and apache-1.3/htdocs/manual/images/mod_rewrite_fig1.gif,v differ
diff -ru3 apache-1.3.OK/htdocs/manual/images/mod_rewrite_fig2.fig,v apache-1.3/htdocs/manual/images/mod_rewrite_fig2.fig,v
--- apache-1.3.OK/htdocs/manual/images/mod_rewrite_fig2.fig,v	Sun Jul 19 00:58:12 1998
+++ apache-1.3/htdocs/manual/images/mod_rewrite_fig2.fig,v	Sun Jul 19 00:58:12 1998
@@ -87,3 +87,5 @@
 4 0 0 0 0 1 20 0.0000 4 195 825 5700 5700 Pattern\001
 4 0 0 0 0 0 20 0.0000 4 195 1455 3300 5700 RewriteRule\001
 @
+
+
Binary files apache-1.3.OK/htdocs/manual/images/mod_rewrite_fig2.gif,v and apache-1.3/htdocs/manual/images/mod_rewrite_fig2.gif,v differ
Only in apache-1.3.OK/htdocs/manual/misc: #cvs.rfl.en1.engelschall.com.21235
diff -ru3 apache-1.3.OK/htdocs/manual/misc/custom_errordocs.html,v apache-1.3/htdocs/manual/misc/custom_errordocs.html,v
--- apache-1.3.OK/htdocs/manual/misc/custom_errordocs.html,v	Sun Jul 19 00:58:13 1998
+++ apache-1.3/htdocs/manual/misc/custom_errordocs.html,v	Sun Jul 19 00:58:13 1998
@@ -704,3 +704,5 @@
 a388 1
 </body></html>
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/misc/perf-hp.html,v apache-1.3/htdocs/manual/misc/perf-hp.html,v
--- apache-1.3.OK/htdocs/manual/misc/perf-hp.html,v	Sun Jul 19 00:58:14 1998
+++ apache-1.3/htdocs/manual/misc/perf-hp.html,v	Sun Jul 19 00:58:14 1998
@@ -228,3 +228,5 @@
 a77 1
 must have MLOCK priviledges. Setprivgrp(1m) should be consulted for
 @
+
+
Only in apache-1.3.OK/htdocs/manual/mod: #cvs.rfl.en1.26598
Only in apache-1.3.OK/htdocs/manual/mod: #cvs.rfl.en1.26645
Only in apache-1.3.OK/htdocs/manual/mod: #cvs.rfl.en1.26708
diff -ru3 apache-1.3.OK/htdocs/manual/mod/directive-dict.html,v apache-1.3/htdocs/manual/mod/directive-dict.html,v
--- apache-1.3.OK/htdocs/manual/mod/directive-dict.html,v	Sun Jul 19 00:58:15 1998
+++ apache-1.3/htdocs/manual/mod/directive-dict.html,v	Sun Jul 19 00:58:15 1998
@@ -325,3 +325,5 @@
 a187 1
   <SAMP>AllowOverrides</SAMP> directives at lower levels.  The
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/mod/mod_mmap_static.html,v apache-1.3/htdocs/manual/mod/mod_mmap_static.html,v
--- apache-1.3.OK/htdocs/manual/mod/mod_mmap_static.html,v	Sun Jul 19 00:58:18 1998
+++ apache-1.3/htdocs/manual/mod/mod_mmap_static.html,v	Sun Jul 19 00:58:18 1998
@@ -248,3 +248,4 @@
   
 d128 9
 @
+
diff -ru3 apache-1.3.OK/htdocs/manual/mod/mod_so.html,v apache-1.3/htdocs/manual/mod/mod_so.html,v
--- apache-1.3.OK/htdocs/manual/mod/mod_so.html,v	Sun Jul 19 00:58:18 1998
+++ apache-1.3/htdocs/manual/mod/mod_so.html,v	Sun Jul 19 00:58:18 1998
@@ -300,3 +300,5 @@
 a63 1
 <h2><A name="loadmodule">LoadModule</A></h2>
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/mod/mod_unique_id.html,v apache-1.3/htdocs/manual/mod/mod_unique_id.html,v
--- apache-1.3.OK/htdocs/manual/mod/mod_unique_id.html,v	Sun Jul 19 00:58:19 1998
+++ apache-1.3/htdocs/manual/mod/mod_unique_id.html,v	Sun Jul 19 00:58:19 1998
@@ -333,3 +333,5 @@
 a176 1
 <code>mod_unique_id</code> has no directives.
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/details.html,v apache-1.3/htdocs/manual/vhosts/details.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/details.html,v	Sun Jul 19 00:58:19 1998
+++ apache-1.3/htdocs/manual/vhosts/details.html,v	Sun Jul 19 00:58:19 1998
@@ -888,3 +888,5 @@
 a302 1
     number for the request. The request is only catched if the port number
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/details_1_2.html,v apache-1.3/htdocs/manual/vhosts/details_1_2.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/details_1_2.html,v	Wed Aug 19 08:16:56 1998
+++ apache-1.3/htdocs/manual/vhosts/details_1_2.html,v	Wed Aug 19 08:16:56 1998
@@ -883,3 +883,5 @@
 a392 1
 </ul>
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/examples.html,v apache-1.3/htdocs/manual/vhosts/examples.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/examples.html,v	Sun Jul 19 00:58:19 1998
+++ apache-1.3/htdocs/manual/vhosts/examples.html,v	Sun Jul 19 00:58:19 1998
@@ -997,3 +997,5 @@
 a137 1
     The main server can never catch a request, because all IP addresss
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/fd-limits.html,v apache-1.3/htdocs/manual/vhosts/fd-limits.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/fd-limits.html,v	Sun Jul 19 00:58:19 1998
+++ apache-1.3/htdocs/manual/vhosts/fd-limits.html,v	Sun Jul 19 00:58:19 1998
@@ -179,3 +179,5 @@
 a58 1
 </body></html>
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/footer.html,v apache-1.3/htdocs/manual/vhosts/footer.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/footer.html,v	Sun Jul 19 00:58:19 1998
+++ apache-1.3/htdocs/manual/vhosts/footer.html,v	Sun Jul 19 00:58:19 1998
@@ -87,3 +87,5 @@
 a6 1
 <A HREF="./"><IMG SRC="images/index.gif" ALT="Index"></A>
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/header.html,v apache-1.3/htdocs/manual/vhosts/header.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/header.html,v	Sun Jul 19 00:58:20 1998
+++ apache-1.3/htdocs/manual/vhosts/header.html,v	Sun Jul 19 00:58:20 1998
@@ -65,3 +65,5 @@
 a2 1
  <IMG SRC="images/sub.gif" ALT="[APACHE DOCUMENTATION]">
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/host.html,v apache-1.3/htdocs/manual/vhosts/host.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/host.html,v	Sun Jul 19 00:58:20 1998
+++ apache-1.3/htdocs/manual/vhosts/host.html,v	Sun Jul 19 00:58:20 1998
@@ -465,3 +465,5 @@
 <code>http://www.apache.org/apache/</code>, and then access the
 pages.</p>
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/index.html,v apache-1.3/htdocs/manual/vhosts/index.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/index.html,v	Sun Jul 19 00:58:20 1998
+++ apache-1.3/htdocs/manual/vhosts/index.html,v	Sun Jul 19 00:58:20 1998
@@ -172,3 +172,5 @@
 a25 1
 <p>Apache was one of the first servers to support IP-based
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/ip-based.html,v apache-1.3/htdocs/manual/vhosts/ip-based.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/ip-based.html,v	Sun Jul 19 00:58:20 1998
+++ apache-1.3/htdocs/manual/vhosts/ip-based.html,v	Sun Jul 19 00:58:20 1998
@@ -334,3 +334,5 @@
 a30 1
 operating systems (see system documentation for details).
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/name-based.html,v apache-1.3/htdocs/manual/vhosts/name-based.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/name-based.html,v	Sun Jul 19 00:58:20 1998
+++ apache-1.3/htdocs/manual/vhosts/name-based.html,v	Sun Jul 19 00:58:20 1998
@@ -446,3 +446,5 @@
 a58 1
 directive which specifies any IP address that should be used as a target for
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/vhosts-in-depth.html,v apache-1.3/htdocs/manual/vhosts/vhosts-in-depth.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/vhosts-in-depth.html,v	Wed Aug 19 08:16:59 1998
+++ apache-1.3/htdocs/manual/vhosts/vhosts-in-depth.html,v	Wed Aug 19 08:16:59 1998
@@ -883,3 +883,5 @@
 a392 1
 </ul>
 @
+
+
diff -ru3 apache-1.3.OK/htdocs/manual/vhosts/virtual-host.html,v apache-1.3/htdocs/manual/vhosts/virtual-host.html,v
--- apache-1.3.OK/htdocs/manual/vhosts/virtual-host.html,v	Sun Jul 19 00:58:20 1998
+++ apache-1.3/htdocs/manual/vhosts/virtual-host.html,v	Sun Jul 19 00:58:20 1998
@@ -549,3 +549,5 @@
 a99 1
 <A HREF="mod/mod_log_common.html#transferlog">TransferLog</A> configuration
 @
+
+
diff -ru3 apache-1.3.OK/src/.gdbinit,v apache-1.3/src/.gdbinit,v
--- apache-1.3.OK/src/.gdbinit,v	Sun Jul 19 00:58:30 1998
+++ apache-1.3/src/.gdbinit,v	Sun Jul 19 00:58:30 1998
@@ -61,3 +61,5 @@
 text
 @d1 3
 @
+
+
diff -ru3 apache-1.3.OK/src/CHANGES,v apache-1.3/src/CHANGES,v
--- apache-1.3.OK/src/CHANGES,v	Mon Aug 17 20:36:17 1998
+++ apache-1.3/src/CHANGES,v	Thu Aug 20 06:07:44 1998
@@ -1,4 +1,4 @@
-head	1.1029;
+head	1.1030;
 access;
 symbols
 	APACHE_1_3_1:1.970
@@ -49,6 +49,11 @@
 comment	@# @;
 
 
+1.1030
+date	98.08.20.04.07.43;	author dgaudet;	state Exp;
+branches;
+next	1.1029;
+
 1.1029
 date	98.08.17.18.36.16;	author rse;	state Exp;
 branches;
@@ -5432,17 +5437,23 @@
 @@
 
 
-1.1029
+1.1030
 log
-@Bump up MAX_ENV_FLAGS in mod_rewrite.h from the too conservatice limit of
-5 to 10 because there are some users out there who always have 5 to 8
-variables in one RewriteRule and had to patch mod_rewrite.h for every
-release. So 15 should be now more than enough, even for them. (I never
-needed more than 4 in my RewriteRules ;-)
+@Add the ability to benchmark POST requests.
+
+Note I tweaked Kurt's submission to fit our style guide... and I corrected
+a few comments and crud that have been in ab.c since the zb.c days.  And
+for some reason ab was printing the results twice for me, I fixed that.
+
+PR:             2871
+Submitted by:   Kurt Sussman <kls@@best.com>  [modified by Dean]
 @
 text
 @Changes with Apache 1.3.2
 
+  *) Add the ability to do POST requests to the ab benchmarking tool.
+     [Kurt Sussman <kls@@best.com>] PR#2871
+
   *) Bump up MAX_ENV_FLAGS in mod_rewrite.h from the too conservatice limit of
      5 to 10 because there are some users out there who always have 5 to 8
      variables in one RewriteRule and had to patch mod_rewrite.h for every
@@ -10667,6 +10678,19 @@
   *) Based on NCSA httpd 1.3 by Rob McCool and patches by CERT,
      Roy Fielding, Robert Thau, Nicolas Pioch, David Robinson,
      Brian Behlendorf, Rob Hartill, and Cliff Skolnick
+@
+
+
+1.1029
+log
+@Bump up MAX_ENV_FLAGS in mod_rewrite.h from the too conservatice limit of
+5 to 10 because there are some users out there who always have 5 to 8
+variables in one RewriteRule and had to patch mod_rewrite.h for every
+release. So 15 should be now more than enough, even for them. (I never
+needed more than 4 in my RewriteRules ;-)
+@
+text
+@d3 3
 @
 
 
diff -ru3 apache-1.3.OK/src/README.EBCDIC,v apache-1.3/src/README.EBCDIC,v
--- apache-1.3.OK/src/README.EBCDIC,v	Sun Jul 19 00:58:34 1998
+++ apache-1.3/src/README.EBCDIC,v	Sun Jul 19 00:58:34 1998
@@ -299,3 +299,5 @@
 a127 1
 			    Martin Kraemer, 22-Dec-1997
 @
+
+
diff -ru3 apache-1.3.OK/src/ap/.cvsignore,v apache-1.3/src/ap/.cvsignore,v
--- apache-1.3.OK/src/ap/.cvsignore,v	Sun Jul 19 00:58:35 1998
+++ apache-1.3/src/ap/.cvsignore,v	Sun Jul 19 00:58:35 1998
@@ -58,3 +58,5 @@
 text
 @d2 1
 @
+
+
diff -ru3 apache-1.3.OK/src/ap/Attic/ap_strings.c,v apache-1.3/src/ap/Attic/ap_strings.c,v
--- apache-1.3.OK/src/ap/Attic/ap_strings.c,v	Fri Jun 19 23:02:34 1998
+++ apache-1.3/src/ap/Attic/ap_strings.c,v	Fri Jun 19 23:02:34 1998
@@ -614,3 +614,5 @@
 a62 1
     char *inchr = instring;
 @
+
+
diff -ru3 apache-1.3.OK/src/ap/Makefile.tmpl,v apache-1.3/src/ap/Makefile.tmpl,v
--- apache-1.3.OK/src/ap/Makefile.tmpl,v	Tue Aug  4 15:32:19 1998
+++ apache-1.3/src/ap/Makefile.tmpl,v	Tue Aug  4 15:32:19 1998
@@ -887,3 +887,5 @@
 a24 1
 	ar cr $(LIB) $(OBJS)
 @
+
+
diff -ru3 apache-1.3.OK/src/ap/ap.dsp,v apache-1.3/src/ap/ap.dsp,v
--- apache-1.3.OK/src/ap/ap.dsp,v	Thu Aug  6 00:15:07 1998
+++ apache-1.3/src/ap/ap.dsp,v	Thu Aug  6 00:15:07 1998
@@ -191,3 +191,5 @@
 a63 1
 # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 @
+
+
diff -ru3 apache-1.3.OK/src/ap/ap.mak,v apache-1.3/src/ap/ap.mak,v
--- apache-1.3.OK/src/ap/ap.mak,v	Thu Aug  6 00:15:07 1998
+++ apache-1.3/src/ap/ap.mak,v	Thu Aug  6 00:15:07 1998
@@ -550,3 +550,5 @@
 a233 1
 	"..\regex\regex.h"\
 @
+
+
diff -ru3 apache-1.3.OK/src/ap/ap_cpystrn.c,v apache-1.3/src/ap/ap_cpystrn.c,v
--- apache-1.3.OK/src/ap/ap_cpystrn.c,v	Sun Jul 19 00:58:35 1998
+++ apache-1.3/src/ap/ap_cpystrn.c,v	Sun Jul 19 00:58:35 1998
@@ -225,3 +225,5 @@
 a69 1
 char *ap_cpystrn(char *dst, const char *src, size_t dst_size)
 @
+
+
diff -ru3 apache-1.3.OK/src/ap/ap_execve.c,v apache-1.3/src/ap/ap_execve.c,v
--- apache-1.3.OK/src/ap/ap_execve.c,v	Sun Jul 19 00:58:35 1998
+++ apache-1.3/src/ap/ap_execve.c,v	Sun Jul 19 00:58:35 1998
@@ -594,3 +594,5 @@
 text
 @d284 2
 @
+
+
diff -ru3 apache-1.3.OK/src/ap/ap_signal.c,v apache-1.3/src/ap/ap_signal.c,v
--- apache-1.3.OK/src/ap/ap_signal.c,v	Sun Jul 19 00:58:35 1998
+++ apache-1.3/src/ap/ap_signal.c,v	Sun Jul 19 00:58:35 1998
@@ -179,3 +179,5 @@
 a2 1
  * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
 @
+
+
diff -ru3 apache-1.3.OK/src/ap/ap_slack.c,v apache-1.3/src/ap/ap_slack.c,v
--- apache-1.3.OK/src/ap/ap_slack.c,v	Sun Jul 19 00:58:35 1998
+++ apache-1.3/src/ap/ap_slack.c,v	Sun Jul 19 00:58:35 1998
@@ -621,3 +621,5 @@
 a2 1
  * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
 @
+
+
diff -ru3 apache-1.3.OK/src/buildmark.c,v apache-1.3/src/buildmark.c,v
--- apache-1.3.OK/src/buildmark.c,v	Sun Jul 19 00:58:34 1998
+++ apache-1.3/src/buildmark.c,v	Sun Jul 19 00:58:34 1998
@@ -703,3 +703,5 @@
 text
 @d1 1
 @
+
+
diff -ru3 apache-1.3.OK/src/helpers/PrintPathOS2,v apache-1.3/src/helpers/PrintPathOS2,v
--- apache-1.3.OK/src/helpers/PrintPathOS2,v	Mon Aug  3 23:51:40 1998
+++ apache-1.3/src/helpers/PrintPathOS2,v	Mon Aug  3 23:51:40 1998
@@ -189,3 +189,5 @@
 a20 1
     if [ $test_exec_flag $path/$1.exe ] && [ ! -d $path/$1.exe ]; then
 @
+
+
diff -ru3 apache-1.3.OK/src/helpers/find-dbm-lib,v apache-1.3/src/helpers/find-dbm-lib,v
--- apache-1.3.OK/src/helpers/find-dbm-lib,v	Sun Jul 19 00:58:36 1998
+++ apache-1.3/src/helpers/find-dbm-lib,v	Sun Jul 19 00:58:36 1998
@@ -153,3 +153,5 @@
 a38 1
 	    found_dbm=1
 @
+
+
diff -ru3 apache-1.3.OK/src/helpers/findprg.sh,v apache-1.3/src/helpers/findprg.sh,v
--- apache-1.3.OK/src/helpers/findprg.sh,v	Sun Jul 19 00:58:36 1998
+++ apache-1.3/src/helpers/findprg.sh,v	Sun Jul 19 00:58:36 1998
@@ -123,3 +123,4 @@
     #   iterate over names
     for name in $namelist; do
 @
+
diff -ru3 apache-1.3.OK/src/helpers/fmn.sh,v apache-1.3/src/helpers/fmn.sh,v
--- apache-1.3.OK/src/helpers/fmn.sh,v	Sun Jul 19 00:58:36 1998
+++ apache-1.3/src/helpers/fmn.sh,v	Sun Jul 19 00:58:36 1998
@@ -108,3 +108,5 @@
 echo "$modname"
 
 @
+
+
diff -ru3 apache-1.3.OK/src/helpers/fp2rp,v apache-1.3/src/helpers/fp2rp,v
--- apache-1.3.OK/src/helpers/fp2rp,v	Sun Jul 19 00:58:36 1998
+++ apache-1.3/src/helpers/fp2rp,v	Sun Jul 19 00:58:36 1998
@@ -83,3 +83,5 @@
 text
 @d2 3
 @
+
+
diff -ru3 apache-1.3.OK/src/helpers/install.sh,v apache-1.3/src/helpers/install.sh,v
--- apache-1.3.OK/src/helpers/install.sh,v	Sun Jul 19 00:58:37 1998
+++ apache-1.3/src/helpers/install.sh,v	Sun Jul 19 00:58:37 1998
@@ -158,3 +158,5 @@
 exit 0
 
 @
+
+
diff -ru3 apache-1.3.OK/src/helpers/mfhead,v apache-1.3/src/helpers/mfhead,v
--- apache-1.3.OK/src/helpers/mfhead,v	Sun Jul 19 00:58:37 1998
+++ apache-1.3/src/helpers/mfhead,v	Sun Jul 19 00:58:37 1998
@@ -44,3 +44,5 @@
 echo "##"
 echo ""
 @
+
+
diff -ru3 apache-1.3.OK/src/helpers/mkdir.sh,v apache-1.3/src/helpers/mkdir.sh,v
--- apache-1.3.OK/src/helpers/mkdir.sh,v	Sat Jul 25 13:25:05 1998
+++ apache-1.3/src/helpers/mkdir.sh,v	Sat Jul 25 13:25:05 1998
@@ -127,3 +127,5 @@
 text
 @d11 1
 @
+
+
diff -ru3 apache-1.3.OK/src/helpers/mkshadow.sh,v apache-1.3/src/helpers/mkshadow.sh,v
--- apache-1.3.OK/src/helpers/mkshadow.sh,v	Sun Jul 19 00:58:37 1998
+++ apache-1.3/src/helpers/mkshadow.sh,v	Sun Jul 19 00:58:37 1998
@@ -203,3 +203,5 @@
      esac
 d82 1
 @
+
+
diff -ru3 apache-1.3.OK/src/helpers/ppl.sh,v apache-1.3/src/helpers/ppl.sh,v
--- apache-1.3.OK/src/helpers/ppl.sh,v	Sun Jul 19 00:58:37 1998
+++ apache-1.3/src/helpers/ppl.sh,v	Sun Jul 19 00:58:37 1998
@@ -113,3 +113,5 @@
 sed -e 's/^/                        [/' -e 's/$/]/'
 
 @
+
+
Only in apache-1.3.OK/src/include: #cvs.rfl.en1.engelschall.com.25485
diff -ru3 apache-1.3.OK/src/include/.cvsignore,v apache-1.3/src/include/.cvsignore,v
--- apache-1.3.OK/src/include/.cvsignore,v	Sun Jul 19 00:58:37 1998
+++ apache-1.3/src/include/.cvsignore,v	Sun Jul 19 00:58:37 1998
@@ -204,3 +204,5 @@
 text
 @d2 1
 @
+
+
diff -ru3 apache-1.3.OK/src/include/Attic/apctype.h,v apache-1.3/src/include/Attic/apctype.h,v
--- apache-1.3.OK/src/include/Attic/apctype.h,v	Mon Jul 13 13:32:34 1998
+++ apache-1.3/src/include/Attic/apctype.h,v	Mon Jul 13 13:32:34 1998
@@ -210,3 +210,4 @@
  * SIO stdio-replacement strx_* functions by Panos Tsirigotis
  * <panos@@alumni.cs.colorado.edu> for xinetd.
 @
+
diff -ru3 apache-1.3.OK/src/include/ap.h,v apache-1.3/src/include/ap.h,v
--- apache-1.3.OK/src/include/ap.h,v	Sun Jul 19 00:58:37 1998
+++ apache-1.3/src/include/ap.h,v	Sun Jul 19 00:58:37 1998
@@ -564,3 +564,5 @@
 a66 1
 #endif
 @
+
+
diff -ru3 apache-1.3.OK/src/include/ap_compat.h,v apache-1.3/src/include/ap_compat.h,v
--- apache-1.3.OK/src/include/ap_compat.h,v	Sun Jul 19 00:58:37 1998
+++ apache-1.3/src/include/ap_compat.h,v	Sun Jul 19 00:58:37 1998
@@ -794,3 +794,4 @@
 text
 @d392 4
 @
+
diff -ru3 apache-1.3.OK/src/include/ap_ctype.h,v apache-1.3/src/include/ap_ctype.h,v
--- apache-1.3.OK/src/include/ap_ctype.h,v	Sun Jul 19 00:58:38 1998
+++ apache-1.3/src/include/ap_ctype.h,v	Sun Jul 19 00:58:38 1998
@@ -218,3 +218,4 @@
  * SIO stdio-replacement strx_* functions by Panos Tsirigotis
  * <panos@@alumni.cs.colorado.edu> for xinetd.
 @
+
diff -ru3 apache-1.3.OK/src/include/ap_mmn.h,v apache-1.3/src/include/ap_mmn.h,v
--- apache-1.3.OK/src/include/ap_mmn.h,v	Sun Aug 16 22:21:25 1998
+++ apache-1.3/src/include/ap_mmn.h,v	Sun Aug 16 22:21:25 1998
@@ -298,3 +298,4 @@
 text
 @d169 1
 @
+
diff -ru3 apache-1.3.OK/src/include/compat.h,v apache-1.3/src/include/compat.h,v
--- apache-1.3.OK/src/include/compat.h,v	Sun Jul 19 00:58:39 1998
+++ apache-1.3/src/include/compat.h,v	Sun Jul 19 00:58:39 1998
@@ -819,3 +819,4 @@
 text
 @d392 4
 @
+
diff -ru3 apache-1.3.OK/src/include/util_uri.h,v apache-1.3/src/include/util_uri.h,v
--- apache-1.3.OK/src/include/util_uri.h,v	Sun Jul 19 00:58:45 1998
+++ apache-1.3/src/include/util_uri.h,v	Sun Jul 19 00:58:45 1998
@@ -816,3 +816,5 @@
 a2 1
  * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
 @
+
+
diff -ru3 apache-1.3.OK/src/main/gen_test_char.c,v apache-1.3/src/main/gen_test_char.c,v
--- apache-1.3.OK/src/main/gen_test_char.c,v	Sun Jul 19 00:58:46 1998
+++ apache-1.3/src/main/gen_test_char.c,v	Sun Jul 19 00:58:46 1998
@@ -191,3 +191,5 @@
 a59 1
     printf("};\n");
 @
+
+
diff -ru3 apache-1.3.OK/src/main/gen_test_char.dsp,v apache-1.3/src/main/gen_test_char.dsp,v
--- apache-1.3.OK/src/main/gen_test_char.dsp,v	Sun Jul 19 00:58:46 1998
+++ apache-1.3/src/main/gen_test_char.dsp,v	Sun Jul 19 00:58:46 1998
@@ -139,3 +139,5 @@
 # End Target
 # End Project
 @
+
+
diff -ru3 apache-1.3.OK/src/main/gen_test_char.mak,v apache-1.3/src/main/gen_test_char.mak,v
--- apache-1.3.OK/src/main/gen_test_char.mak,v	Sun Jul 19 00:58:46 1998
+++ apache-1.3/src/main/gen_test_char.mak,v	Sun Jul 19 00:58:46 1998
@@ -290,3 +290,5 @@
 a221 1
 	"..\include\hide.h"\
 @
+
+
diff -ru3 apache-1.3.OK/src/main/gen_uri_delims.c,v apache-1.3/src/main/gen_uri_delims.c,v
--- apache-1.3.OK/src/main/gen_uri_delims.c,v	Sun Jul 19 00:58:46 1998
+++ apache-1.3/src/main/gen_uri_delims.c,v	Sun Jul 19 00:58:46 1998
@@ -123,3 +123,5 @@
 	printf("%s%c\n", value, (i < 255) ? ',' : ' ');
 d28 1
 @
+
+
diff -ru3 apache-1.3.OK/src/main/gen_uri_delims.dsp,v apache-1.3/src/main/gen_uri_delims.dsp,v
--- apache-1.3.OK/src/main/gen_uri_delims.dsp,v	Sun Jul 19 00:58:46 1998
+++ apache-1.3/src/main/gen_uri_delims.dsp,v	Sun Jul 19 00:58:46 1998
@@ -139,3 +139,5 @@
 # End Target
 # End Project
 @
+
+
diff -ru3 apache-1.3.OK/src/main/gen_uri_delims.mak,v apache-1.3/src/main/gen_uri_delims.mak,v
--- apache-1.3.OK/src/main/gen_uri_delims.mak,v	Sun Jul 19 00:58:46 1998
+++ apache-1.3/src/main/gen_uri_delims.mak,v	Sun Jul 19 00:58:46 1998
@@ -238,3 +238,5 @@
 !ENDIF 
 
 @
+
+
diff -ru3 apache-1.3.OK/src/main/util_uri.c,v apache-1.3/src/main/util_uri.c,v
--- apache-1.3.OK/src/main/util_uri.c,v	Sun Jul 19 00:58:48 1998
+++ apache-1.3/src/main/util_uri.c,v	Sun Jul 19 00:58:48 1998
@@ -2213,3 +2213,5 @@
 a2 1
  * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/README,v apache-1.3/src/modules/README,v
--- apache-1.3.OK/src/modules/README,v	Sun Jul 19 00:58:49 1998
+++ apache-1.3/src/modules/README,v	Sun Jul 19 00:58:49 1998
@@ -86,3 +86,5 @@
 a33 1
 
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/example/.cvsignore,v apache-1.3/src/modules/example/.cvsignore,v
--- apache-1.3.OK/src/modules/example/.cvsignore,v	Sun Jul 19 00:58:49 1998
+++ apache-1.3/src/modules/example/.cvsignore,v	Sun Jul 19 00:58:49 1998
@@ -52,3 +52,4 @@
 text
 @d2 2
 @
+
diff -ru3 apache-1.3.OK/src/modules/experimental/.cvsignore,v apache-1.3/src/modules/experimental/.cvsignore,v
--- apache-1.3.OK/src/modules/experimental/.cvsignore,v	Sun Jul 19 00:58:50 1998
+++ apache-1.3/src/modules/experimental/.cvsignore,v	Sun Jul 19 00:58:50 1998
@@ -49,3 +49,5 @@
 text
 @d2 2
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/experimental/Makefile.tmpl,v apache-1.3/src/modules/experimental/Makefile.tmpl,v
--- apache-1.3.OK/src/modules/experimental/Makefile.tmpl,v	Sun Jul 19 00:58:50 1998
+++ apache-1.3/src/modules/experimental/Makefile.tmpl,v	Sun Jul 19 00:58:50 1998
@@ -370,3 +370,5 @@
 text
 @d2 20
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/experimental/mod_mmap_static.c,v apache-1.3/src/modules/experimental/mod_mmap_static.c,v
--- apache-1.3.OK/src/modules/experimental/mod_mmap_static.c,v	Sun Jul 19 00:58:50 1998
+++ apache-1.3/src/modules/experimental/mod_mmap_static.c,v	Sun Jul 19 00:58:50 1998
@@ -1020,3 +1020,5 @@
 @a109 1
 #include <unistd.h>
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/standard/.cvsignore,v apache-1.3/src/modules/standard/.cvsignore,v
--- apache-1.3.OK/src/modules/standard/.cvsignore,v	Sun Jul 19 00:58:52 1998
+++ apache-1.3/src/modules/standard/.cvsignore,v	Sun Jul 19 00:58:52 1998
@@ -53,3 +53,4 @@
 text
 @d2 2
 @
+
diff -ru3 apache-1.3.OK/src/modules/standard/mod_so.c,v apache-1.3/src/modules/standard/mod_so.c,v
--- apache-1.3.OK/src/modules/standard/mod_so.c,v	Sun Jul 19 00:58:59 1998
+++ apache-1.3/src/modules/standard/mod_so.c,v	Sun Jul 19 00:58:59 1998
@@ -1946,3 +1946,5 @@
 text
 @d65 22
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/test/.cvsignore,v apache-1.3/src/modules/test/.cvsignore,v
--- apache-1.3.OK/src/modules/test/.cvsignore,v	Sun Jul 19 00:59:00 1998
+++ apache-1.3/src/modules/test/.cvsignore,v	Sun Jul 19 00:59:00 1998
@@ -49,3 +49,5 @@
 text
 @d2 2
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/test/Makefile.tmpl,v apache-1.3/src/modules/test/Makefile.tmpl,v
--- apache-1.3.OK/src/modules/test/Makefile.tmpl,v	Mon Jul 20 18:20:23 1998
+++ apache-1.3/src/modules/test/Makefile.tmpl,v	Mon Jul 20 18:20:23 1998
@@ -314,3 +314,5 @@
 text
 @d2 20
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/test/README,v apache-1.3/src/modules/test/README,v
--- apache-1.3.OK/src/modules/test/README,v	Sun Jul 19 00:59:00 1998
+++ apache-1.3/src/modules/test/README,v	Sun Jul 19 00:59:00 1998
@@ -34,3 +34,5 @@
 server functionality.  They're unsupported, and not guaranteed to remain
 consistant between releases.  You're on your own completely with these.
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/test/mod_rndchunk.c,v apache-1.3/src/modules/test/mod_rndchunk.c,v
--- apache-1.3.OK/src/modules/test/mod_rndchunk.c,v	Sun Jul 19 00:59:00 1998
+++ apache-1.3/src/modules/test/mod_rndchunk.c,v	Sun Jul 19 00:59:00 1998
@@ -719,3 +719,5 @@
 d119 1
 d148 1
 @
+
+
diff -ru3 apache-1.3.OK/src/modules/test/mod_test_util_uri.c,v apache-1.3/src/modules/test/mod_test_util_uri.c,v
--- apache-1.3.OK/src/modules/test/mod_test_util_uri.c,v	Sun Jul 19 00:59:00 1998
+++ apache-1.3/src/modules/test/mod_test_util_uri.c,v	Sun Jul 19 00:59:00 1998
@@ -921,3 +921,5 @@
     for (i = 0; i < sizeof(uri_tests) / sizeof(uri_tests[0]); ++i) {
 	total_failures += iterate_pieces(r, &uri_tests[i], i);
 @
+
+
diff -ru3 apache-1.3.OK/src/os/bs2000/.cvsignore,v apache-1.3/src/os/bs2000/.cvsignore,v
--- apache-1.3.OK/src/os/bs2000/.cvsignore,v	Sun Jul 19 00:59:00 1998
+++ apache-1.3/src/os/bs2000/.cvsignore,v	Sun Jul 19 00:59:00 1998
@@ -34,3 +34,5 @@
 text
 @Makefile
 @
+
+
diff -ru3 apache-1.3.OK/src/os/bs2000/Makefile.tmpl,v apache-1.3/src/os/bs2000/Makefile.tmpl,v
--- apache-1.3.OK/src/os/bs2000/Makefile.tmpl,v	Sun Jul 19 00:59:01 1998
+++ apache-1.3/src/os/bs2000/Makefile.tmpl,v	Sun Jul 19 00:59:01 1998
@@ -250,3 +250,5 @@
 a5 1
 INCDIR=../../main
 @
+
+
diff -ru3 apache-1.3.OK/src/os/bs2000/bs2login.c,v apache-1.3/src/os/bs2000/bs2login.c,v
--- apache-1.3.OK/src/os/bs2000/bs2login.c,v	Sun Jul 19 00:59:01 1998
+++ apache-1.3/src/os/bs2000/bs2login.c,v	Sun Jul 19 00:59:01 1998
@@ -274,3 +274,4 @@
 a173 1
 	exit(1);
 @
+
diff -ru3 apache-1.3.OK/src/os/bs2000/ebcdic.c,v apache-1.3/src/os/bs2000/ebcdic.c,v
--- apache-1.3.OK/src/os/bs2000/ebcdic.c,v	Sun Jul 19 00:59:01 1998
+++ apache-1.3/src/os/bs2000/ebcdic.c,v	Sun Jul 19 00:59:01 1998
@@ -512,3 +512,5 @@
 a134 1
 		*dest++ = _toebcdic[*srce++];
 @
+
+
diff -ru3 apache-1.3.OK/src/os/bs2000/ebcdic.h,v apache-1.3/src/os/bs2000/ebcdic.h,v
--- apache-1.3.OK/src/os/bs2000/ebcdic.h,v	Sun Jul 19 00:59:01 1998
+++ apache-1.3/src/os/bs2000/ebcdic.h,v	Sun Jul 19 00:59:01 1998
@@ -92,3 +92,5 @@
 extern const char _toascii[256];
 extern const char _toebcdic[256];
 @
+
+
diff -ru3 apache-1.3.OK/src/os/bs2000/os-inline.c,v apache-1.3/src/os/bs2000/os-inline.c,v
--- apache-1.3.OK/src/os/bs2000/os-inline.c,v	Sun Jul 19 00:59:01 1998
+++ apache-1.3/src/os/bs2000/os-inline.c,v	Sun Jul 19 00:59:01 1998
@@ -601,3 +601,5 @@
 a27 1
 INLINE int os_is_path_absolute(char *file)
 @
+
+
diff -ru3 apache-1.3.OK/src/os/bs2000/os.c,v apache-1.3/src/os/bs2000/os.c,v
--- apache-1.3.OK/src/os/bs2000/os.c,v	Sun Jul 19 00:59:01 1998
+++ apache-1.3/src/os/bs2000/os.c,v	Sun Jul 19 00:59:01 1998
@@ -655,3 +655,5 @@
 @d1 53
 d60 32
 @
+
+
diff -ru3 apache-1.3.OK/src/os/bs2000/os.h,v apache-1.3/src/os/bs2000/os.h,v
--- apache-1.3.OK/src/os/bs2000/os.h,v	Sun Jul 19 00:59:01 1998
+++ apache-1.3/src/os/bs2000/os.h,v	Sun Jul 19 00:59:01 1998
@@ -696,3 +696,5 @@
 d9 2
 d25 6
 @
+
+
diff -ru3 apache-1.3.OK/src/os/emx/Attic/.cvsignore,v apache-1.3/src/os/emx/Attic/.cvsignore,v
--- apache-1.3.OK/src/os/emx/Attic/.cvsignore,v	Mon Aug  3 11:15:22 1998
+++ apache-1.3/src/os/emx/Attic/.cvsignore,v	Mon Aug  3 11:15:22 1998
@@ -67,3 +67,5 @@
 @
 text
 @@
+
+
diff -ru3 apache-1.3.OK/src/os/emx/Attic/Makefile.tmpl,v apache-1.3/src/os/emx/Attic/Makefile.tmpl,v
--- apache-1.3.OK/src/os/emx/Attic/Makefile.tmpl,v	Mon Aug  3 11:15:23 1998
+++ apache-1.3/src/os/emx/Attic/Makefile.tmpl,v	Mon Aug  3 11:15:23 1998
@@ -292,3 +292,5 @@
 a5 1
 INCDIR=../../main
 @
+
+
diff -ru3 apache-1.3.OK/src/os/emx/Attic/os-inline.c,v apache-1.3/src/os/emx/Attic/os-inline.c,v
--- apache-1.3.OK/src/os/emx/Attic/os-inline.c,v	Mon Aug  3 11:15:24 1998
+++ apache-1.3/src/os/emx/Attic/os-inline.c,v	Mon Aug  3 11:15:24 1998
@@ -637,3 +637,5 @@
 a27 1
 INLINE int os_is_path_absolute(char *file)
 @
+
+
diff -ru3 apache-1.3.OK/src/os/emx/Attic/os.c,v apache-1.3/src/os/emx/Attic/os.c,v
--- apache-1.3.OK/src/os/emx/Attic/os.c,v	Mon Aug  3 11:15:25 1998
+++ apache-1.3/src/os/emx/Attic/os.c,v	Mon Aug  3 11:15:25 1998
@@ -72,3 +72,5 @@
 @
 text
 @@
+
+
diff -ru3 apache-1.3.OK/src/os/emx/Attic/os.h,v apache-1.3/src/os/emx/Attic/os.h,v
--- apache-1.3.OK/src/os/emx/Attic/os.h,v	Mon Aug  3 11:15:26 1998
+++ apache-1.3/src/os/emx/Attic/os.h,v	Mon Aug  3 11:15:26 1998
@@ -607,3 +607,5 @@
 a19 1
 extern int os_is_path_absolute(char *f);
 @
+
+
diff -ru3 apache-1.3.OK/src/os/emx/Attic/util_os2.c,v apache-1.3/src/os/emx/Attic/util_os2.c,v
--- apache-1.3.OK/src/os/emx/Attic/util_os2.c,v	Mon Aug  3 11:15:31 1998
+++ apache-1.3/src/os/emx/Attic/util_os2.c,v	Mon Aug  3 11:15:31 1998
@@ -84,3 +84,4 @@
 @
 text
 @@
+
diff -ru3 apache-1.3.OK/src/os/unix/os-aix-dso.c,v apache-1.3/src/os/unix/os-aix-dso.c,v
--- apache-1.3.OK/src/os/unix/os-aix-dso.c,v	Sun Jul 19 00:59:02 1998
+++ apache-1.3/src/os/unix/os-aix-dso.c,v	Sun Jul 19 00:59:02 1998
@@ -717,3 +717,4 @@
 text
 @d95 14
 @
+
diff -ru3 apache-1.3.OK/src/os/win32/ApacheModuleSpeling.dsp,v apache-1.3/src/os/win32/ApacheModuleSpeling.dsp,v
--- apache-1.3.OK/src/os/win32/ApacheModuleSpeling.dsp,v	Sun Jul 19 00:59:04 1998
+++ apache-1.3/src/os/win32/ApacheModuleSpeling.dsp,v	Sun Jul 19 00:59:04 1998
@@ -218,3 +218,5 @@
 a74 1
 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/ApacheModuleSpeling.mak,v apache-1.3/src/os/win32/ApacheModuleSpeling.mak,v
--- apache-1.3.OK/src/os/win32/ApacheModuleSpeling.mak,v	Thu Aug 13 03:55:23 1998
+++ apache-1.3/src/os/win32/ApacheModuleSpeling.mak,v	Thu Aug 13 03:55:23 1998
@@ -501,3 +501,5 @@
 d237 1
 d247 7
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/Module.mak.tmpl,v apache-1.3/src/os/win32/Module.mak.tmpl,v
--- apache-1.3.OK/src/os/win32/Module.mak.tmpl,v	Thu Aug 13 03:55:24 1998
+++ apache-1.3/src/os/win32/Module.mak.tmpl,v	Thu Aug 13 03:55:24 1998
@@ -282,3 +282,4 @@
 text
 @d214 1
 @
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/README.TXT,v apache-1.3/src/os/win32/installer/README.TXT,v
--- apache-1.3.OK/src/os/win32/installer/README.TXT,v	Sun Jul 19 00:59:09 1998
+++ apache-1.3/src/os/win32/installer/README.TXT,v	Sun Jul 19 00:59:09 1998
@@ -36,3 +36,5 @@
 for details of how to use this IS2 configuration file and
 the installer DLL to build an Apache release.
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/apache.iwz,v apache-1.3/src/os/win32/installer/apache.iwz,v
--- apache-1.3.OK/src/os/win32/installer/apache.iwz,v	Mon Jul 20 11:56:25 1998
+++ apache-1.3/src/os/win32/installer/apache.iwz,v	Mon Jul 20 11:56:25 1998
@@ -2277,3 +2277,5 @@
 Regs=6
 d769 9
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/install.c,v apache-1.3/src/os/win32/installer/installdll/install.c,v
--- apache-1.3.OK/src/os/win32/installer/installdll/install.c,v	Sun Jul 19 00:59:09 1998
+++ apache-1.3/src/os/win32/installer/installdll/install.c,v	Sun Jul 19 00:59:09 1998
@@ -672,3 +672,5 @@
 a532 1
 	pfileItem++;
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/install.def,v apache-1.3/src/os/win32/installer/installdll/install.def,v
--- apache-1.3.OK/src/os/win32/installer/installdll/install.def,v	Sun Jul 19 00:59:09 1998
+++ apache-1.3/src/os/win32/installer/installdll/install.def,v	Sun Jul 19 00:59:09 1998
@@ -40,3 +40,5 @@
 		BeforeExit @@1
 		DllMain @@2
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/install.dsp,v apache-1.3/src/os/win32/installer/installdll/install.dsp,v
--- apache-1.3.OK/src/os/win32/installer/installdll/install.dsp,v	Sun Jul 19 00:59:09 1998
+++ apache-1.3/src/os/win32/installer/installdll/install.dsp,v	Sun Jul 19 00:59:09 1998
@@ -137,3 +137,5 @@
 # End Target
 # End Project
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/install.mak,v apache-1.3/src/os/win32/installer/installdll/install.mak,v
--- apache-1.3.OK/src/os/win32/installer/installdll/install.mak,v	Sun Jul 19 00:59:09 1998
+++ apache-1.3/src/os/win32/installer/installdll/install.mak,v	Sun Jul 19 00:59:09 1998
@@ -322,3 +322,5 @@
 
 !ENDIF 
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/test/resource.h,v apache-1.3/src/os/win32/installer/installdll/test/resource.h,v
--- apache-1.3.OK/src/os/win32/installer/installdll/test/resource.h,v	Sun Jul 19 00:59:10 1998
+++ apache-1.3/src/os/win32/installer/installdll/test/resource.h,v	Sun Jul 19 00:59:10 1998
@@ -57,3 +57,5 @@
 #endif
 #endif
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/test/test.c,v apache-1.3/src/os/win32/installer/installdll/test/test.c,v
--- apache-1.3.OK/src/os/win32/installer/installdll/test/test.c,v	Sun Jul 19 00:59:10 1998
+++ apache-1.3/src/os/win32/installer/installdll/test/test.c,v	Sun Jul 19 00:59:10 1998
@@ -188,3 +188,5 @@
 }
 
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/test/test.def,v apache-1.3/src/os/win32/installer/installdll/test/test.def,v
--- apache-1.3.OK/src/os/win32/installer/installdll/test/test.def,v	Sun Jul 19 00:59:10 1998
+++ apache-1.3/src/os/win32/installer/installdll/test/test.def,v	Sun Jul 19 00:59:10 1998
@@ -36,3 +36,5 @@
 @NAME         Test
 DESCRIPTION  'Test Installer DLL'
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/test/test.dsp,v apache-1.3/src/os/win32/installer/installdll/test/test.dsp,v
--- apache-1.3.OK/src/os/win32/installer/installdll/test/test.dsp,v	Sun Jul 19 00:59:10 1998
+++ apache-1.3/src/os/win32/installer/installdll/test/test.dsp,v	Sun Jul 19 00:59:10 1998
@@ -155,3 +155,5 @@
 # End Target
 # End Project
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/test/test.h,v apache-1.3/src/os/win32/installer/installdll/test/test.h,v
--- apache-1.3.OK/src/os/win32/installer/installdll/test/test.h,v	Sun Jul 19 00:59:10 1998
+++ apache-1.3/src/os/win32/installer/installdll/test/test.h,v	Sun Jul 19 00:59:10 1998
@@ -38,3 +38,5 @@
 
 
 @
+
+
Binary files apache-1.3.OK/src/os/win32/installer/installdll/test/test.ico,v and apache-1.3/src/os/win32/installer/installdll/test/test.ico,v differ
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/test/test.mak,v apache-1.3/src/os/win32/installer/installdll/test/test.mak,v
--- apache-1.3.OK/src/os/win32/installer/installdll/test/test.mak,v	Sun Jul 19 00:59:10 1998
+++ apache-1.3/src/os/win32/installer/installdll/test/test.mak,v	Sun Jul 19 00:59:10 1998
@@ -274,3 +274,5 @@
 !ENDIF 
 
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/installer/installdll/test/test.rc,v apache-1.3/src/os/win32/installer/installdll/test/test.rc,v
--- apache-1.3.OK/src/os/win32/installer/installdll/test/test.rc,v	Sun Jul 19 00:59:10 1998
+++ apache-1.3/src/os/win32/installer/installdll/test/test.rc,v	Sun Jul 19 00:59:10 1998
@@ -171,3 +171,5 @@
 #endif    // not APSTUDIO_INVOKED
 
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/main_win32.c,v apache-1.3/src/os/win32/main_win32.c,v
--- apache-1.3.OK/src/os/win32/main_win32.c,v	Sun Jul 19 00:59:06 1998
+++ apache-1.3/src/os/win32/main_win32.c,v	Sun Jul 19 00:59:06 1998
@@ -69,3 +69,5 @@
 a15 1
     apache_main(argc, argv);
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/registry.c,v apache-1.3/src/os/win32/registry.c,v
--- apache-1.3.OK/src/os/win32/registry.c,v	Sun Jul 19 01:35:43 1998
+++ apache-1.3/src/os/win32/registry.c,v	Sun Jul 19 01:35:43 1998
@@ -954,3 +954,5 @@
 a335 1
 		"Registry does not contain key " REGKEY);
 @
+
+
diff -ru3 apache-1.3.OK/src/os/win32/registry.h,v apache-1.3/src/os/win32/registry.h,v
--- apache-1.3.OK/src/os/win32/registry.h,v	Sun Jul 19 00:59:08 1998
+++ apache-1.3/src/os/win32/registry.h,v	Sun Jul 19 00:59:08 1998
@@ -40,3 +40,5 @@
 extern int ap_registry_get_server_root(pool *p, char *dir, int size);
 extern int ap_registry_set_server_root(char *dir);
 @
+
+
diff -ru3 apache-1.3.OK/src/regex/Makefile.tmpl,v apache-1.3/src/regex/Makefile.tmpl,v
--- apache-1.3.OK/src/regex/Makefile.tmpl,v	Sun Jul 19 00:59:10 1998
+++ apache-1.3/src/regex/Makefile.tmpl,v	Sun Jul 19 00:59:10 1998
@@ -344,3 +344,5 @@
 	#cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h
 	#rm -f regex.tmp
 @
+
+
diff -ru3 apache-1.3.OK/src/regex/engine.ih,v apache-1.3/src/regex/engine.ih,v
--- apache-1.3.OK/src/regex/engine.ih,v	Sun Jul 19 00:59:11 1998
+++ apache-1.3/src/regex/engine.ih,v	Sun Jul 19 00:59:11 1998
@@ -146,3 +146,4 @@
 text
 @d1 2
 @
+
diff -ru3 apache-1.3.OK/src/regex/regcomp.ih,v apache-1.3/src/regex/regcomp.ih,v
--- apache-1.3.OK/src/regex/regcomp.ih,v	Sun Jul 19 00:59:11 1998
+++ apache-1.3/src/regex/regcomp.ih,v	Sun Jul 19 00:59:11 1998
@@ -159,3 +159,4 @@
 text
 @d1 2
 @
+
diff -ru3 apache-1.3.OK/src/regex/regerror.ih,v apache-1.3/src/regex/regerror.ih,v
--- apache-1.3.OK/src/regex/regerror.ih,v	Sun Jul 19 00:59:12 1998
+++ apache-1.3/src/regex/regerror.ih,v	Sun Jul 19 00:59:12 1998
@@ -123,3 +123,4 @@
 text
 @d1 2
 @
+
diff -ru3 apache-1.3.OK/src/regex/regex.dsp,v apache-1.3/src/regex/regex.dsp,v
--- apache-1.3.OK/src/regex/regex.dsp,v	Sun Jul 19 00:59:12 1998
+++ apache-1.3/src/regex/regex.dsp,v	Sun Jul 19 00:59:12 1998
@@ -146,3 +146,5 @@
 # End Target
 # End Project
 @
+
+
diff -ru3 apache-1.3.OK/src/support/ab.1,v apache-1.3/src/support/ab.1,v
--- apache-1.3.OK/src/support/ab.1,v	Sun Jul 19 00:59:17 1998
+++ apache-1.3/src/support/ab.1,v	Sun Jul 19 00:59:17 1998
@@ -184,3 +184,5 @@
 a29 1
 .\" 5. Redistributions of any form whatsoever must retain the following
 @
+
+
diff -ru3 apache-1.3.OK/src/support/ab.c,v apache-1.3/src/support/ab.c,v
--- apache-1.3.OK/src/support/ab.c,v	Wed Jul 29 12:14:40 1998
+++ apache-1.3/src/support/ab.c,v	Thu Aug 20 06:11:33 1998
@@ -1,4 +1,4 @@
-head	1.11;
+head	1.13;
 access;
 symbols
 	APACHE_1_3_1:1.10
@@ -14,6 +14,16 @@
 comment	@ * @;
 
 
+1.13
+date	98.08.20.04.11.33;	author dgaudet;	state Exp;
+branches;
+next	1.12;
+
+1.12
+date	98.08.20.04.07.45;	author dgaudet;	state Exp;
+branches;
+next	1.11;
+
 1.11
 date	98.07.29.10.14.40;	author martin;	state Exp;
 branches;
@@ -74,9 +84,9 @@
 @@
 
 
-1.11
+1.13
 log
-@Added EBCDIC support to ApacheBench
+@note a few bugs
 @
 text
 @/* ====================================================================
@@ -160,20 +170,51 @@
 **      Michael Campanella <campanella@@stevms.enet.dec.com>
 **    - Enhanced by Dean Gaudet <dgaudet@@apache.org>, November 1997
 **    - Cleaned up by Ralf S. Engelschall <rse@@apache.org>, March 1998 
+**    - POST and verbosity by Kurt Sussman <kls@@merlot.com>, August 1998 
 **
 */
 
-#define VERSION "1.1"
+/*
+ * 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"
 
 /*  -------------------------------------------------------------------- */
 
 /* affects include files on Solaris */
 #define BSD_COMP
 
+/* allow compilation outside an Apache build tree */
+#ifdef NO_APACHE_INCLUDES
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+#include <string.h>
+
+#define ap_select	select
+#else /* (!)NO_APACHE_INCLUDES */
 #include "ap_config.h"
 #include <fcntl.h>
 #include <sys/time.h>
-
+#endif /* NO_APACHE_INCLUDES */
 /* ------------------- DEFINITIONS -------------------------- */
 
 /* maximum number of requests on a time limited test */
@@ -210,6 +251,8 @@
 
 /* --------------------- GLOBALS ---------------------------- */
 
+int verbosity = 0;              /* no verbosity by default */
+int posting = 0;                /* GET by default */
 int requests = 1;               /* Number of requests to make */
 int concurrency = 1;            /* Number of multiple requests to make */
 int tlimit = 0;                 /* time limit in cs */
@@ -217,17 +260,23 @@
 char servername[1024];          /* name that server reports */
 char hostname[1024];            /* host name */
 char path[1024];                /* path name */
+char postfile[1024];            /* name of file containing post data */
+char* postdata;                 /* *buffer containing data from postfile */
+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 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 */
+int totalposted = 0;            /* total number of bytes posted, inc. headers */
 int done = 0;                   /* number of requests we have done */
 int doneka = 0;                 /* number of keep alive connections done */
 int good = 0, bad = 0;          /* number of good and bad requests */
 
 /* store error cases */
 int err_length = 0, err_conn = 0, err_except = 0;
+int err_response = 0;
 
 struct timeval start, endtime;
 
@@ -236,7 +285,7 @@
 int reqlen;
 
 /* one global throw-away buffer to read stuff into */
-char buffer[4096];
+char buffer[8192];
 
 struct connection *con;         /* connection array */
 struct data *stats;             /* date for each request */
@@ -250,7 +299,12 @@
 
 static void err(char *s)
 {
-    perror(s);
+    if (errno) {
+    	perror(s);
+    }
+    else {
+	printf("%s", s);
+    }
     exit(errno);
 }
 
@@ -262,7 +316,13 @@
 static void write_request(struct connection *c)
 {
     gettimeofday(&c->connect, 0);
+    /* XXX: this could use writev for posting -- more efficient -djg */
     write(c->fd, request, reqlen);
+    if (posting) {
+        write(c->fd,postdata, postlen);
+        totalposted += (reqlen + postlen); 
+    }
+
     c->state = STATE_READ;
     FD_SET(c->fd, &readbits);
     FD_CLR(c->fd, &writebits);
@@ -295,7 +355,7 @@
 
 /* --------------------------------------------------------- */
 
-/* calculate and output results and exit */
+/* calculate and output results */
 
 static void output_results(void)
 {
@@ -320,16 +380,26 @@
     if (bad)
         printf("   (Connect: %d, Length: %d, Exceptions: %d)\n",
                err_conn, err_length, err_except);
+    if (err_response)
+        printf("Non-2xx responses:      %d\n", err_response);
     if (keepalive)
         printf("Keep-Alive requests:    %d\n", doneka);
     printf("Total transferred:      %d bytes\n", totalread);
+    if (posting)
+        printf("Total POSTed:           %d\n", totalposted);
     printf("HTML transferred:       %d bytes\n", totalbread);
 
     /* avoid divide by zero */
     if (timetaken) {
         printf("Requests per second:    %.2f\n", 1000 * (float) (done) / timetaken);
-        printf("Transfer rate:          %.2f kb/s\n",
+        printf("Transfer rate:          %.2f kb/s received\n",
                (float) (totalread) / timetaken);
+        if (posting) {
+            printf("                        %.2f kb/s sent\n", 
+       		    (float)(totalposted)/timetaken);
+            printf("                        %.2f kb/s total\n", 
+           	    (float)(totalread + totalposted)/timetaken);
+        }
     }
 
     {
@@ -349,12 +419,13 @@
             total += s.time;
         }
         printf("\nConnnection Times (ms)\n");
-        printf("           min   avg   max\n");
-        printf("Connect: %5d %5d %5d\n", mincon, totalcon / requests, maxcon);
-        printf("Total:   %5d %5d %5d\n", mintot, total / requests, maxtot);
+        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);
     }
-
-    exit(0);
 }
 
 /* --------------------------------------------------------- */
@@ -386,8 +457,7 @@
             close(c->fd);
             err_conn++;
             if (bad++ > 10) {
-                printf("\nTest aborted after 10 failures\n\n");
-                exit(1);
+                err("\nTest aborted after 10 failures\n\n");
             }
             start_connect(c);
         }
@@ -404,7 +474,7 @@
 static void close_connection(struct connection *c)
 {
     if (c->read == 0 && c->keepalive) {
-        /* server has legitiamately shut down an idle keep alive request */
+        /* server has legitimately shut down an idle keep alive request */
         good--;                 /* connection never happend */
     }
     else {
@@ -444,6 +514,8 @@
 static void read_connection(struct connection *c)
 {
     int r;
+    char *part;
+    char respcode[4];  /* 3 digits and null */
 
     r = read(c->fd, buffer, sizeof(buffer));
     if (r == 0 || (r < 0 && errno != EAGAIN)) {
@@ -471,6 +543,9 @@
         c->cbx += tocopy;
         space -= tocopy;
         c->cbuff[c->cbx] = 0;   /* terminate for benefit of strstr */
+	if (verbosity >= 4) {
+	    printf("LOG: header received:\n%s\n", c->cbuff);
+	}
         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 */
@@ -487,8 +562,7 @@
                 /* header is in invalid or too big - close connection */
                 close(c->fd);
                 if (bad++ > 10) {
-                    printf("\nTest aborted after 10 failures\n\n");
-                    exit(1);
+                    err("\nTest aborted after 10 failures\n\n");
                 }
                 FD_CLR(c->fd, &writebits);
                 start_connect(c);
@@ -509,6 +583,23 @@
                 *q = 0;
             }
 
+	    /* 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 */
+
+            /* check response code */
+            part = strstr(c->cbuff, "HTTP");                /* really HTTP/1.x_ */
+            strncpy(respcode, (part+strlen("HTTP/1.x_")), 3);
+	    respcode[3] = '\0';
+            if (respcode[0] != '2') {
+                err_response++;
+                if (verbosity >= 2) printf ("WARNING: Response code not 2xx (%s)\n", respcode);
+            }
+	    else if (verbosity >= 3) {
+                printf("LOG: Response code = %s\n", respcode);
+            }
+
             c->gotheader = 1;
             *s = 0;             /* terminate at end of header */
             if (keepalive &&
@@ -516,8 +607,7 @@
                  || strstr(c->cbuff, "keep-alive"))) {  /* for benefit of MSIIS */
                 char *cl;
                 cl = strstr(c->cbuff, "Content-Length:");
-                /* for cacky servers like NCSA which break the spec and send a 
-                   lower case 'l' */
+                /* handle NCSA, which sends Content-length: */
                 if (!cl)
                     cl = strstr(c->cbuff, "Content-length:");
                 if (cl) {
@@ -584,7 +674,7 @@
         struct hostent *he;
         he = gethostbyname(hostname);
         if (!he)
-            err("gethostbyname");
+            err("bad hostname");
         server.sin_family = he->h_addrtype;
         server.sin_port = htons(port);
         server.sin_addr.s_addr = ((unsigned long *) (he->h_addr_list[0]))[0];
@@ -599,7 +689,8 @@
     FD_ZERO(&writebits);
 
     /* setup request */
-    sprintf(request, "GET %s HTTP/1.0\r\n"
+    if (!posting) {
+	sprintf(request, "GET %s HTTP/1.0\r\n"
                      "User-Agent: ApacheBench/%s\r\n"
                      "%s"
                      "Host: %s\r\n"
@@ -609,6 +700,24 @@
                      VERSION,
                      keepalive ? "Connection: Keep-Alive\r\n" : "", 
                      hostname);
+    }
+    else {
+	sprintf(request, "POST %s HTTP/1.0\r\n"
+                     "User-Agent: ApacheBench/%s\r\n"
+                     "%s"
+                     "Host: %s\r\n"
+                     "Accept: */*\r\n"
+                     "Content-length: %d\r\n"
+                     "Content-type: %s\r\n"
+                     "\r\n", 
+                     path, 
+                     VERSION,
+                     keepalive ? "Connection: Keep-Alive\r\n" : "", 
+                     hostname, postlen, 
+                     (content_type) ? content_type : "text/plain");
+    }
+
+    if (verbosity >= 2) printf("INFO: POST header == \n---\n%s\n---\n", request);
 
     reqlen = strlen(request);
 
@@ -634,7 +743,6 @@
         gettimeofday(&now, 0);
         if (tlimit && timedif(now, start) > (tlimit * 1000)) {
             requests = done;    /* so stats are correct */
-            output_results();
         }
 
         /* Timeout of 30 seconds. */
@@ -642,8 +750,7 @@
         timeout.tv_usec = 0;
         n = ap_select(FD_SETSIZE, &sel_read, &sel_write, &sel_except, &timeout);
         if (!n) {
-            printf("\nServer timed out\n\n");
-            exit(1);
+            err("\nServer timed out\n\n");
         }
         if (n < 1)
             err("select");
@@ -661,9 +768,8 @@
             if (FD_ISSET(s, &sel_write))
                 write_request(&con[i]);
         }
-        if (done >= requests)
-            output_results();
     }
+    output_results();
 }
 
 /* ------------------------------------------------------- */
@@ -685,8 +791,11 @@
     fprintf(stderr, "    -n requests     Number of requests to perform\n");
     fprintf(stderr, "    -c concurrency  Number of multiple requests to make\n");
     fprintf(stderr, "    -t timelimit    Seconds to max. wait for responses\n");
+    fprintf(stderr, "    -p postfile     File containg data to POST\n");
+    fprintf(stderr, "    -T content-type Content-type header for POSTing\n");
+    fprintf(stderr, "    -v verbosity    How much troubleshooting info to print\n");
+    fprintf(stderr, "    -V              Print version number and exit\n");
     fprintf(stderr, "    -k              Use HTTP KeepAlive feature\n");
-    fprintf(stderr, "    -v              Display version and copyright information\n");
     fprintf(stderr, "    -h              Display usage information (this message)\n");
     exit(EINVAL);
 }
@@ -721,21 +830,50 @@
 
 /* ------------------------------------------------------- */
 
+/* read data to POST from file, save contents and length */
+
+int open_postfile(char *pfile)
+{
+    int postfd, status;
+    struct stat postfilestat;
+
+    if ((postfd = open(pfile, O_RDONLY)) == -1) {
+        printf("Invalid postfile name (%s)\n", pfile);
+        return errno;
+    }
+    if ((status = fstat(postfd, &postfilestat)) == -1) {
+        perror("Can\'t stat postfile\n");
+        return status;
+    }
+    postdata = malloc(postfilestat.st_size);
+    if (!postdata) {
+        printf("Can\'t alloc postfile buffer\n");
+        return ENOMEM;
+    }
+    if (read(postfd, postdata, postfilestat.st_size) != postfilestat.st_size) {
+        printf("error reading postfilen");
+        return EIO;
+    }
+    postlen = postfilestat.st_size;
+    return 0;
+}
+
+/* ------------------------------------------------------- */
+
 extern char *optarg;
 extern int optind, opterr, optopt;
 
 /* sort out command-line args and call test */
 int main(int argc, char **argv)
 {
-    int c;
+    int c, r;
     optind = 1;
-    while ((c = getopt(argc, argv, "n:c:t:kvh")) > 0) {
+    while ((c = getopt(argc, argv, "n:c:t:T:p:v:kVh")) > 0) {
         switch (c) {
         case 'n':
             requests = atoi(optarg);
             if (!requests) {
-                printf("Invalid number of requests\n");
-                exit(1);
+                err("Invalid number of requests\n");
             }
             break;
         case 'k':
@@ -744,11 +882,25 @@
         case 'c':
             concurrency = atoi(optarg);
             break;
+        case 'p':
+            if (0 == (r = open_postfile(optarg))) {
+                posting = 1;
+            }
+	    else if (postdata) {
+                exit(r);
+	    }
+            break;
+        case 'v':
+            verbosity = atoi(optarg);
+            break;
         case 't':
             tlimit = atoi(optarg);
             requests = MAX_REQUESTS;    /* need to size data array on something */
             break;
-        case 'v':
+        case 'T':
+            strcpy(content_type, optarg);
+            break;
+        case 'V':
             copyright();
             exit(0);
             break;
@@ -773,12 +925,131 @@
 
     copyright();
     test();
+
     exit(0);
 }
 
 @
 
 
+1.12
+log
+@Add the ability to benchmark POST requests.
+
+Note I tweaked Kurt's submission to fit our style guide... and I corrected
+a few comments and crud that have been in ab.c since the zb.c days.  And
+for some reason ab was printing the results twice for me, I fixed that.
+
+PR:             2871
+Submitted by:   Kurt Sussman <kls@@best.com>  [modified by Dean]
+@
+text
+@d86 12
+d495 1
+a495 1
+	    /* FIXME: this parsing isn't even remotely HTTP compliant...
+@
+
+
+1.11
+log
+@Added EBCDIC support to ApacheBench
+@
+text
+@d82 1
+d86 1
+a86 1
+#define VERSION "1.1"
+d93 18
+d114 1
+a114 1
+
+d151 2
+d160 4
+d169 1
+d176 1
+d185 1
+a185 1
+char buffer[4096];
+d199 6
+a204 1
+    perror(s);
+d216 1
+d218 5
+d255 1
+a255 1
+/* calculate and output results and exit */
+d280 2
+d285 2
+d292 1
+a292 1
+        printf("Transfer rate:          %.2f kb/s\n",
+d294 6
+d319 6
+a324 3
+        printf("           min   avg   max\n");
+        printf("Connect: %5d %5d %5d\n", mincon, totalcon / requests, maxcon);
+        printf("Total:   %5d %5d %5d\n", mintot, total / requests, maxtot);
+a325 2
+
+    exit(0);
+d357 1
+a357 2
+                printf("\nTest aborted after 10 failures\n\n");
+                exit(1);
+d374 1
+a374 1
+        /* server has legitiamately shut down an idle keep alive request */
+d414 2
+d443 3
+d462 1
+a462 2
+                    printf("\nTest aborted after 10 failures\n\n");
+                    exit(1);
+d483 17
+d507 1
+a507 2
+                /* for cacky servers like NCSA which break the spec and send a 
+                   lower case 'l' */
+d574 1
+a574 1
+            err("gethostbyname");
+d589 2
+a590 1
+    sprintf(request, "GET %s HTTP/1.0\r\n"
+d600 18
+a642 1
+            output_results();
+d650 1
+a650 2
+            printf("\nServer timed out\n\n");
+            exit(1);
+a667 2
+        if (done >= requests)
+            output_results();
+d669 1
+d691 4
+a695 1
+    fprintf(stderr, "    -v              Display version and copyright information\n");
+d730 30
+d766 1
+a766 1
+    int c;
+d768 1
+a768 1
+    while ((c = getopt(argc, argv, "n:c:t:kvh")) > 0) {
+d773 1
+a773 2
+                printf("Invalid number of requests\n");
+                exit(1);
+d782 11
+d797 4
+a800 1
+        case 'v':
+d825 1
+@
+
+
 1.10
 log
 @Use ap_select instead of select in ab, and replace hardcoded 256 with
@@ -1041,3 +1312,5 @@
 a614 1
 int parse_url(char *url)
 @
+
+
diff -ru3 apache-1.3.OK/src/support/apachectl.1,v apache-1.3/src/support/apachectl.1,v
--- apache-1.3.OK/src/support/apachectl.1,v	Sun Jul 19 00:59:17 1998
+++ apache-1.3/src/support/apachectl.1,v	Sun Jul 19 00:59:17 1998
@@ -271,3 +271,5 @@
 a2 1
 .\" Copyright (c) 1997 The Apache Group. All rights reserved.
 @
+
+
diff -ru3 apache-1.3.OK/src/support/apxs.8,v apache-1.3/src/support/apxs.8,v
--- apache-1.3.OK/src/support/apxs.8,v	Sun Jul 19 00:59:17 1998
+++ apache-1.3/src/support/apxs.8,v	Sun Jul 19 00:59:17 1998
@@ -456,3 +456,5 @@
 a273 1
 Shared object installation:
 @
+
+
diff -ru3 apache-1.3.OK/src/support/apxs.pl,v apache-1.3/src/support/apxs.pl,v
--- apache-1.3.OK/src/support/apxs.pl,v	Mon Aug  3 10:44:08 1998
+++ apache-1.3/src/support/apxs.pl,v	Mon Aug  3 10:44:08 1998
@@ -960,3 +960,5 @@
 a63 1
 require 5.004;
 @
+
+
diff -ru3 apache-1.3.OK/src/support/dbmmanage.1,v apache-1.3/src/support/dbmmanage.1,v
--- apache-1.3.OK/src/support/dbmmanage.1,v	Sun Jul 19 00:59:17 1998
+++ apache-1.3/src/support/dbmmanage.1,v	Sun Jul 19 00:59:17 1998
@@ -173,3 +173,5 @@
 a29 1
 .\" 5. Redistributions of any form whatsoever must retain the following
 @
+
+
diff -ru3 apache-1.3.OK/src/support/htdigest.1,v apache-1.3/src/support/htdigest.1,v
--- apache-1.3.OK/src/support/htdigest.1,v	Sun Jul 19 00:59:18 1998
+++ apache-1.3/src/support/htdigest.1,v	Sun Jul 19 00:59:18 1998
@@ -151,3 +151,5 @@
 a30 1
 .\" 5. Redistributions of any form whatsoever must retain the following
 @
+
+
diff -ru3 apache-1.3.OK/src/support/httpd.exp,v apache-1.3/src/support/httpd.exp,v
--- apache-1.3.OK/src/support/httpd.exp,v	Sun Jul 19 00:59:18 1998
+++ apache-1.3/src/support/httpd.exp,v	Sun Jul 19 00:59:18 1998
@@ -434,3 +434,4 @@
 a287 1
 ap_set_module_config
 @
+
diff -ru3 apache-1.3.OK/src/support/logresolve.8,v apache-1.3/src/support/logresolve.8,v
--- apache-1.3.OK/src/support/logresolve.8,v	Sun Jul 19 00:59:18 1998
+++ apache-1.3/src/support/logresolve.8,v	Sun Jul 19 00:59:18 1998
@@ -141,3 +141,5 @@
 a29 1
 .\" 5. Redistributions of any form whatsoever must retain the following
 @
+
+
diff -ru3 apache-1.3.OK/src/support/logresolve.pl,v apache-1.3/src/support/logresolve.pl,v
--- apache-1.3.OK/src/support/logresolve.pl,v	Sun Jul 19 00:59:18 1998
+++ apache-1.3/src/support/logresolve.pl,v	Sun Jul 19 00:59:18 1998
@@ -366,3 +366,5 @@
 a32 1
 # 5. Redistributions of any form whatsoever must retain the following
 @
+
+
diff -ru3 apache-1.3.OK/src/support/rotatelogs.8,v apache-1.3/src/support/rotatelogs.8,v
--- apache-1.3.OK/src/support/rotatelogs.8,v	Sun Jul 19 00:59:19 1998
+++ apache-1.3/src/support/rotatelogs.8,v	Sun Jul 19 00:59:19 1998
@@ -157,3 +157,5 @@
 a29 1
 .\" 5. Redistributions of any form whatsoever must retain the following
 @
+
+
diff -ru3 apache-1.3.OK/src/support/split-logfile,v apache-1.3/src/support/split-logfile,v
--- apache-1.3.OK/src/support/split-logfile,v	Sun Jul 19 00:59:19 1998
+++ apache-1.3/src/support/split-logfile,v	Sun Jul 19 00:59:19 1998
@@ -178,3 +178,5 @@
 a4 1
 # Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
 @
+
+
diff -ru3 apache-1.3.OK/src/support/suexec.8,v apache-1.3/src/support/suexec.8,v
--- apache-1.3.OK/src/support/suexec.8,v	Sun Jul 19 00:59:19 1998
+++ apache-1.3/src/support/suexec.8,v	Sun Jul 19 00:59:19 1998
@@ -124,3 +124,5 @@
 a29 1
 .\" 5. Redistributions of any form whatsoever must retain the following
 @
+
+
diff -ru3 apache-1.3.OK/src/test/.cvsignore,v apache-1.3/src/test/.cvsignore,v
--- apache-1.3.OK/src/test/.cvsignore,v	Sun Jul 19 00:59:20 1998
+++ apache-1.3/src/test/.cvsignore,v	Sun Jul 19 00:59:20 1998
@@ -42,3 +42,5 @@
 test_date
 test_select
 @
+
+
diff -ru3 apache-1.3.OK/src/test/README,v apache-1.3/src/test/README,v
--- apache-1.3.OK/src/test/README,v	Sun Jul 19 00:59:20 1998
+++ apache-1.3/src/test/README,v	Sun Jul 19 00:59:20 1998
@@ -37,3 +37,5 @@
 of Apache functionality.  This stuff is for the developers only,
 so we might remove it on public releases.
 @
+
+
diff -ru3 apache-1.3.OK/src/test/check_chunked,v apache-1.3/src/test/check_chunked,v
--- apache-1.3.OK/src/test/check_chunked,v	Sun Jul 19 00:59:20 1998
+++ apache-1.3/src/test/check_chunked,v	Sun Jul 19 00:59:20 1998
@@ -87,3 +87,5 @@
 text
 @d7 2
 @
+
+
diff -ru3 apache-1.3.OK/src/test/rename/README,v apache-1.3/src/test/rename/README,v
--- apache-1.3.OK/src/test/rename/README,v	Sun Jul 19 00:59:22 1998
+++ apache-1.3/src/test/rename/README,v	Sun Jul 19 00:59:22 1998
@@ -214,3 +214,4 @@
 a13 1
 
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/apapi.h,v apache-1.3/src/test/rename/apapi.h,v
--- apache-1.3.OK/src/test/rename/apapi.h,v	Sun Jul 19 00:59:22 1998
+++ apache-1.3/src/test/rename/apapi.h,v	Sun Jul 19 00:59:22 1998
@@ -565,3 +565,4 @@
 
 #endif /* APAPI_H */
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/apapi.h.mk,v apache-1.3/src/test/rename/apapi.h.mk,v
--- apache-1.3.OK/src/test/rename/apapi.h.mk,v	Sun Jul 19 00:59:22 1998
+++ apache-1.3/src/test/rename/apapi.h.mk,v	Sun Jul 19 00:59:22 1998
@@ -181,3 +181,4 @@
 a54 1
 			}
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/apapi_compat.h,v apache-1.3/src/test/rename/apapi_compat.h,v
--- apache-1.3.OK/src/test/rename/apapi_compat.h,v	Sun Jul 19 00:59:22 1998
+++ apache-1.3/src/test/rename/apapi_compat.h,v	Sun Jul 19 00:59:22 1998
@@ -670,3 +670,4 @@
 a514 1
 #define unregister_other_child         apx_unregister_other_child
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/apapi_compat.h.mk,v apache-1.3/src/test/rename/apapi_compat.h.mk,v
--- apache-1.3.OK/src/test/rename/apapi_compat.h.mk,v	Sun Jul 19 00:59:22 1998
+++ apache-1.3/src/test/rename/apapi_compat.h.mk,v	Sun Jul 19 00:59:22 1998
@@ -145,3 +145,4 @@
  *   Apache 1.3 symbols which are
  *   _NO LONGER PART OF THE API_
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/compat.h,v apache-1.3/src/test/rename/compat.h,v
--- apache-1.3.OK/src/test/rename/compat.h,v	Sun Jul 19 00:59:22 1998
+++ apache-1.3/src/test/rename/compat.h,v	Sun Jul 19 00:59:22 1998
@@ -446,3 +446,4 @@
 d211 1
 d290 1
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/csubst/Makefile,v apache-1.3/src/test/rename/csubst/Makefile,v
--- apache-1.3.OK/src/test/rename/csubst/Makefile,v	Sun Jul 19 00:59:23 1998
+++ apache-1.3/src/test/rename/csubst/Makefile,v	Sun Jul 19 00:59:23 1998
@@ -85,3 +85,4 @@
 @a28 1
 	-rm -f Makefile
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/csubst/csubst.c,v apache-1.3/src/test/rename/csubst/csubst.c,v
--- apache-1.3.OK/src/test/rename/csubst/csubst.c,v	Sun Jul 19 00:59:23 1998
+++ apache-1.3/src/test/rename/csubst/csubst.c,v	Sun Jul 19 00:59:23 1998
@@ -183,3 +183,4 @@
 a7 1
 #include <err.h>
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/csubst/lexer.c,v apache-1.3/src/test/rename/csubst/lexer.c,v
--- apache-1.3.OK/src/test/rename/csubst/lexer.c,v	Sun Jul 19 00:59:23 1998
+++ apache-1.3/src/test/rename/csubst/lexer.c,v	Sun Jul 19 00:59:23 1998
@@ -2290,3 +2290,4 @@
 #include <err.h>
 d538 1
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/csubst/lexer.l,v apache-1.3/src/test/rename/csubst/lexer.l,v
--- apache-1.3.OK/src/test/rename/csubst/lexer.l,v	Sun Jul 19 00:59:23 1998
+++ apache-1.3/src/test/rename/csubst/lexer.l,v	Sun Jul 19 00:59:23 1998
@@ -278,3 +278,4 @@
 #include <err.h>
 d14 1
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/csubst/util.c,v apache-1.3/src/test/rename/csubst/util.c,v
--- apache-1.3.OK/src/test/rename/csubst/util.c,v	Sun Jul 19 00:59:23 1998
+++ apache-1.3/src/test/rename/csubst/util.c,v	Sun Jul 19 00:59:23 1998
@@ -205,3 +205,4 @@
 a133 1
 	fprintf(stderr, "%s: ", __progname);
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/rename.cf,v apache-1.3/src/test/rename/rename.cf,v
--- apache-1.3.OK/src/test/rename/rename.cf,v	Sun Jul 19 00:59:23 1998
+++ apache-1.3/src/test/rename/rename.cf,v	Sun Jul 19 00:59:23 1998
@@ -1453,3 +1453,4 @@
 apapi_get_server_built         API_get_server_built
 d450 2
 @
+
diff -ru3 apache-1.3.OK/src/test/rename/rename.cf.update,v apache-1.3/src/test/rename/rename.cf.update,v
--- apache-1.3.OK/src/test/rename/rename.cf.update,v	Sun Jul 19 00:59:23 1998
+++ apache-1.3/src/test/rename/rename.cf.update,v	Sun Jul 19 00:59:23 1998
@@ -108,3 +108,4 @@
 a17 1
     if ($rc =~ m|\.c:\d+:\s*API_EXPORT\(|s) {
 @
+
diff -ru3 apache-1.3.OK/src/test/test-writev.c,v apache-1.3/src/test/test-writev.c,v
--- apache-1.3.OK/src/test/test-writev.c,v	Sun Jul 19 00:59:21 1998
+++ apache-1.3/src/test/test-writev.c,v	Sun Jul 19 00:59:21 1998
@@ -117,3 +117,5 @@
     exit(0);
 }
 @
+
+
diff -ru3 apache-1.3.OK/src/test/test_date.c,v apache-1.3/src/test/test_date.c,v
--- apache-1.3.OK/src/test/test_date.c,v	Sun Jul 19 00:59:21 1998
+++ apache-1.3/src/test/test_date.c,v	Sun Jul 19 00:59:21 1998
@@ -214,3 +214,5 @@
     exit(0);
 }
 @
+
+
diff -ru3 apache-1.3.OK/src/test/test_select.c,v apache-1.3/src/test/test_select.c,v
--- apache-1.3.OK/src/test/test_select.c,v	Sun Jul 19 00:59:21 1998
+++ apache-1.3/src/test/test_select.c,v	Sun Jul 19 00:59:21 1998
@@ -64,3 +64,5 @@
     exit(0);
 }
 @
+
+
diff -ru3 apache-1.3.OK/src/test/time-sem.c,v apache-1.3/src/test/time-sem.c,v
--- apache-1.3.OK/src/test/time-sem.c,v	Sun Jul 19 00:59:21 1998
+++ apache-1.3/src/test/time-sem.c,v	Sun Jul 19 00:59:21 1998
@@ -808,3 +808,5 @@
 @d62 1
 d109 1
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/README,v apache-1.3/src/test/vhtest/README,v
--- apache-1.3.OK/src/test/vhtest/README,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/README,v	Sun Jul 19 00:59:24 1998
@@ -103,3 +103,5 @@
     perl -pi.orig -e "s#/home/dgaudet/ap/vhtest#`pwd`#" *.conf
     cd ..
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/bin/test1,v apache-1.3/src/test/vhtest/bin/test1,v
--- apache-1.3.OK/src/test/vhtest/bin/test1,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/bin/test1,v	Sun Jul 19 00:59:24 1998
@@ -122,3 +122,5 @@
 bin/vhget 127.0.0.4 8080 'vhost1' main
 bin/vhget 127.0.0.4 8080 'vhost2' main
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/bin/test1d,v apache-1.3/src/test/vhtest/bin/test1d,v
--- apache-1.3.OK/src/test/vhtest/bin/test1d,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/bin/test1d,v	Sun Jul 19 00:59:24 1998
@@ -122,3 +122,5 @@
 bin/vhget 127.0.0.4 8080 'vhost1' default1
 bin/vhget 127.0.0.4 8080 'vhost2' default1
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/bin/test2,v apache-1.3/src/test/vhtest/bin/test2,v
--- apache-1.3.OK/src/test/vhtest/bin/test2,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/bin/test2,v	Sun Jul 19 00:59:24 1998
@@ -153,3 +153,5 @@
 bin/vhget 127.0.0.4 8081 '' main
 bin/vhget 127.0.0.4 8081 'vhost1:8081' main
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/bin/test2d,v apache-1.3/src/test/vhtest/bin/test2d,v
--- apache-1.3.OK/src/test/vhtest/bin/test2d,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/bin/test2d,v	Sun Jul 19 00:59:24 1998
@@ -153,3 +153,5 @@
 bin/vhget 127.0.0.4 8081 '' default2
 bin/vhget 127.0.0.4 8081 'vhost1:8081' default2
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/bin/test3,v apache-1.3/src/test/vhtest/bin/test3,v
--- apache-1.3.OK/src/test/vhtest/bin/test3,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/bin/test3,v	Sun Jul 19 00:59:24 1998
@@ -107,3 +107,5 @@
 bin/vhget 127.0.0.1 8081 vhost4:8081 vhost4
 bin/vhget 127.0.0.1 8081 vhost5:8081 vhost5
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/bin/test4,v apache-1.3/src/test/vhtest/bin/test4,v
--- apache-1.3.OK/src/test/vhtest/bin/test4,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/bin/test4,v	Sun Jul 19 00:59:24 1998
@@ -98,3 +98,5 @@
 bin/vhget 127.0.0.1 8081 vhost2:8081 vhost2
 bin/vhget 127.0.0.1 8081 vhost3:8081 vhost1
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/bin/test5,v apache-1.3/src/test/vhtest/bin/test5,v
--- apache-1.3.OK/src/test/vhtest/bin/test5,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/bin/test5,v	Sun Jul 19 00:59:24 1998
@@ -134,3 +134,5 @@
 bin/vhget 127.0.0.3 8081 '' default2
 bin/vhget 127.0.0.3 8081 'vhost1:8081' default2
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/bin/test6,v apache-1.3/src/test/vhtest/bin/test6,v
--- apache-1.3.OK/src/test/vhtest/bin/test6,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/bin/test6,v	Sun Jul 19 00:59:24 1998
@@ -32,3 +32,5 @@
 @
 text
 @@
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/bin/vhget,v apache-1.3/src/test/vhtest/bin/vhget,v
--- apache-1.3.OK/src/test/vhtest/bin/vhget,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/bin/vhget,v	Sun Jul 19 00:59:25 1998
@@ -173,3 +173,5 @@
 my $death = "$remote:$port with " .
 	( $hostheader eq '' ? "no Host:" : "Host: $hostheader" )
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/common.conf,v apache-1.3/src/test/vhtest/conf/common.conf,v
--- apache-1.3.OK/src/test/vhtest/conf/common.conf,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/common.conf,v	Sun Jul 19 00:59:25 1998
@@ -94,3 +94,5 @@
 a16 1
 DocumentRoot /home/dgaudet/ap/vhtest/docroot/main
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/mime.types,v apache-1.3/src/test/vhtest/conf/mime.types,v
--- apache-1.3.OK/src/test/vhtest/conf/mime.types,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/mime.types,v	Sun Jul 19 00:59:25 1998
@@ -135,3 +135,5 @@
 x-conference/x-cooltalk		ice
 x-world/x-vrml			wrl vrml
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/test1.conf,v apache-1.3/src/test/vhtest/conf/test1.conf,v
--- apache-1.3.OK/src/test/vhtest/conf/test1.conf,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/test1.conf,v	Sun Jul 19 00:59:25 1998
@@ -116,3 +116,5 @@
 a27 1
 DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/test1d.conf,v apache-1.3/src/test/vhtest/conf/test1d.conf,v
--- apache-1.3.OK/src/test/vhtest/conf/test1d.conf,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/test1d.conf,v	Sun Jul 19 00:59:25 1998
@@ -127,3 +127,5 @@
 a32 1
 DocumentRoot /home/dgaudet/ap/vhtest/docroot/default1
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/test2.conf,v apache-1.3/src/test/vhtest/conf/test2.conf,v
--- apache-1.3.OK/src/test/vhtest/conf/test2.conf,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/test2.conf,v	Sun Jul 19 00:59:25 1998
@@ -129,3 +129,5 @@
 a34 1
 DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost5
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/test2d.conf,v apache-1.3/src/test/vhtest/conf/test2d.conf,v
--- apache-1.3.OK/src/test/vhtest/conf/test2d.conf,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/test2d.conf,v	Sun Jul 19 00:59:25 1998
@@ -151,3 +151,5 @@
 a43 1
 DocumentRoot /home/dgaudet/ap/vhtest/docroot/default2
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/test3.conf,v apache-1.3/src/test/vhtest/conf/test3.conf,v
--- apache-1.3.OK/src/test/vhtest/conf/test3.conf,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/test3.conf,v	Sun Jul 19 00:59:25 1998
@@ -128,3 +128,5 @@
 a33 1
 DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost5
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/test4.conf,v apache-1.3/src/test/vhtest/conf/test4.conf,v
--- apache-1.3.OK/src/test/vhtest/conf/test4.conf,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/test4.conf,v	Sun Jul 19 00:59:25 1998
@@ -94,3 +94,5 @@
 a17 1
 DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/test5.conf,v apache-1.3/src/test/vhtest/conf/test5.conf,v
--- apache-1.3.OK/src/test/vhtest/conf/test5.conf,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/test5.conf,v	Sun Jul 19 00:59:25 1998
@@ -150,3 +150,5 @@
 a43 1
 DocumentRoot /home/dgaudet/ap/vhtest/docroot/default2
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/conf/test6.conf,v apache-1.3/src/test/vhtest/conf/test6.conf,v
--- apache-1.3.OK/src/test/vhtest/conf/test6.conf,v	Sun Jul 19 00:59:25 1998
+++ apache-1.3/src/test/vhtest/conf/test6.conf,v	Sun Jul 19 00:59:25 1998
@@ -149,3 +149,5 @@
 ## expect all warnings to be printed twice, and probably in the opposite
 ## order mentioned here
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/docroot/default1/vhost.txt,v apache-1.3/src/test/vhtest/docroot/default1/vhost.txt,v
--- apache-1.3.OK/src/test/vhtest/docroot/default1/vhost.txt,v	Sun Jul 19 00:59:26 1998
+++ apache-1.3/src/test/vhtest/docroot/default1/vhost.txt,v	Sun Jul 19 00:59:26 1998
@@ -33,3 +33,5 @@
 text
 @default1
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/docroot/default2/vhost.txt,v apache-1.3/src/test/vhtest/docroot/default2/vhost.txt,v
--- apache-1.3.OK/src/test/vhtest/docroot/default2/vhost.txt,v	Sun Jul 19 00:59:26 1998
+++ apache-1.3/src/test/vhtest/docroot/default2/vhost.txt,v	Sun Jul 19 00:59:26 1998
@@ -33,3 +33,5 @@
 text
 @default2
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/docroot/default3/vhost.txt,v apache-1.3/src/test/vhtest/docroot/default3/vhost.txt,v
--- apache-1.3.OK/src/test/vhtest/docroot/default3/vhost.txt,v	Sun Jul 19 00:59:26 1998
+++ apache-1.3/src/test/vhtest/docroot/default3/vhost.txt,v	Sun Jul 19 00:59:26 1998
@@ -33,3 +33,5 @@
 text
 @default3
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/docroot/main/vhost.txt,v apache-1.3/src/test/vhtest/docroot/main/vhost.txt,v
--- apache-1.3.OK/src/test/vhtest/docroot/main/vhost.txt,v	Sun Jul 19 00:59:26 1998
+++ apache-1.3/src/test/vhtest/docroot/main/vhost.txt,v	Sun Jul 19 00:59:26 1998
@@ -33,3 +33,5 @@
 text
 @main
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/docroot/vhost1/vhost.txt,v apache-1.3/src/test/vhtest/docroot/vhost1/vhost.txt,v
--- apache-1.3.OK/src/test/vhtest/docroot/vhost1/vhost.txt,v	Sun Jul 19 00:59:26 1998
+++ apache-1.3/src/test/vhtest/docroot/vhost1/vhost.txt,v	Sun Jul 19 00:59:26 1998
@@ -33,3 +33,5 @@
 text
 @vhost1
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/docroot/vhost2/vhost.txt,v apache-1.3/src/test/vhtest/docroot/vhost2/vhost.txt,v
--- apache-1.3.OK/src/test/vhtest/docroot/vhost2/vhost.txt,v	Sun Jul 19 00:59:27 1998
+++ apache-1.3/src/test/vhtest/docroot/vhost2/vhost.txt,v	Sun Jul 19 00:59:27 1998
@@ -33,3 +33,5 @@
 text
 @vhost2
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/docroot/vhost3/vhost.txt,v apache-1.3/src/test/vhtest/docroot/vhost3/vhost.txt,v
--- apache-1.3.OK/src/test/vhtest/docroot/vhost3/vhost.txt,v	Sun Jul 19 00:59:27 1998
+++ apache-1.3/src/test/vhtest/docroot/vhost3/vhost.txt,v	Sun Jul 19 00:59:27 1998
@@ -33,3 +33,5 @@
 text
 @vhost3
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/docroot/vhost4/vhost.txt,v apache-1.3/src/test/vhtest/docroot/vhost4/vhost.txt,v
--- apache-1.3.OK/src/test/vhtest/docroot/vhost4/vhost.txt,v	Sun Jul 19 00:59:27 1998
+++ apache-1.3/src/test/vhtest/docroot/vhost4/vhost.txt,v	Sun Jul 19 00:59:27 1998
@@ -33,3 +33,5 @@
 text
 @vhost4
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/docroot/vhost5/vhost.txt,v apache-1.3/src/test/vhtest/docroot/vhost5/vhost.txt,v
--- apache-1.3.OK/src/test/vhtest/docroot/vhost5/vhost.txt,v	Sun Jul 19 00:59:27 1998
+++ apache-1.3/src/test/vhtest/docroot/vhost5/vhost.txt,v	Sun Jul 19 00:59:27 1998
@@ -33,3 +33,5 @@
 text
 @vhost5
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/logs/.cvsignore,v apache-1.3/src/test/vhtest/logs/.cvsignore,v
--- apache-1.3.OK/src/test/vhtest/logs/.cvsignore,v	Sun Jul 19 00:59:28 1998
+++ apache-1.3/src/test/vhtest/logs/.cvsignore,v	Sun Jul 19 00:59:28 1998
@@ -32,3 +32,5 @@
 text
 @*
 @
+
+
diff -ru3 apache-1.3.OK/src/test/vhtest/runtest,v apache-1.3/src/test/vhtest/runtest,v
--- apache-1.3.OK/src/test/vhtest/runtest,v	Sun Jul 19 00:59:24 1998
+++ apache-1.3/src/test/vhtest/runtest,v	Sun Jul 19 00:59:24 1998
@@ -74,3 +74,5 @@
     done
 done
 @
+
+
diff -ru3 apache-1.3.OK/src/test/zb.c,v apache-1.3/src/test/zb.c,v
--- apache-1.3.OK/src/test/zb.c,v	Sun Jul 19 00:59:21 1998
+++ apache-1.3/src/test/zb.c,v	Sun Jul 19 00:59:21 1998
@@ -781,3 +781,5 @@
       requests = 20000;  /* need to size data array on something */
 d562 5
 @
+
+

Mime
View raw message