dgaudet 98/02/08 14:50:19
Modified: src/test/vhtest README
src/test/vhtest/conf common.conf test1.conf test1d.conf
test2.conf test2d.conf test3.conf test4.conf
test5.conf test6.conf
Added: src/test/vhtest/logs .cvsignore
Log:
tweak tweak, docs were slightly wrong
Revision Changes Path
1.2 +1 -3 apache-1.3/src/test/vhtest/README
Index: README
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README 1997/11/10 02:11:41 1.1
+++ README 1998/02/08 22:50:12 1.2
@@ -19,9 +19,7 @@
To use:
- cd conf
- perl -pi.orig -e "s#/home/dgaudet/ap/vhtest#`pwd`#" *.conf
- cd ..
+ perl -pi.orig -e "s#/home/dgaudet/ap/vhtest#`pwd`#" conf/*.conf
./runtest /path/to/httpd
Or to run a specific test:
1.2 +2 -2 apache-1.3/src/test/vhtest/conf/common.conf
Index: common.conf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/common.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- common.conf 1997/11/10 02:11:46 1.1
+++ common.conf 1998/02/08 22:50:13 1.2
@@ -3,7 +3,7 @@
HostnameLookups off
User nobody
Group #-1
-ServerRoot /home/dgaudet/ap/vhtest
+ServerRoot /home/dgaudet/ap/apachen/src/test/vhtest
ErrorLog logs/error_log
LogLevel debug
# vhost "Host header" "request" response-code
@@ -13,7 +13,7 @@
ResourceConfig /dev/null
AccessConfig /dev/null
ServerName main
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/main
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/main
<Directory />
AllowOverride none
1.2 +5 -5 apache-1.3/src/test/vhtest/conf/test1.conf
Index: test1.conf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test1.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test1.conf 1997/11/10 02:11:48 1.1
+++ test1.conf 1998/02/08 22:50:14 1.2
@@ -1,6 +1,6 @@
## test some basic ip-vhosts and a single name-vhost address
-Include /home/dgaudet/ap/vhtest/conf/common.conf
+Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf
#Listen 127.0.0.1:8080
#Listen 127.0.0.2:8080
@@ -9,20 +9,20 @@
<VirtualHost 127.0.0.1:8080>
ServerName vhost1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1
</VirtualHost>
<VirtualHost 127.0.0.2:8080>
ServerName vhost2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2
</VirtualHost>
<VirtualHost 127.0.0.3:8080>
ServerName vhost3
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3
</VirtualHost>
<VirtualHost 127.0.0.3:8080>
ServerName vhost4
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4
</VirtualHost>
1.2 +6 -6 apache-1.3/src/test/vhtest/conf/test1d.conf
Index: test1d.conf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test1d.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test1d.conf 1997/11/10 02:11:48 1.1
+++ test1d.conf 1998/02/08 22:50:14 1.2
@@ -1,6 +1,6 @@
## same as test1, but we throw in a _default_
-Include /home/dgaudet/ap/vhtest/conf/common.conf
+Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf
#Listen 127.0.0.1:8080
#Listen 127.0.0.2:8080
@@ -9,25 +9,25 @@
<VirtualHost 127.0.0.1:8080>
ServerName vhost1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1
</VirtualHost>
<VirtualHost 127.0.0.2:8080>
ServerName vhost2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2
</VirtualHost>
<VirtualHost 127.0.0.3:8080>
ServerName vhost3
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3
</VirtualHost>
<VirtualHost 127.0.0.3:8080>
ServerName vhost4
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4
</VirtualHost>
<VirtualHost _default_:8080>
ServerName default1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/default1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/default1
</VirtualHost>
1.2 +6 -6 apache-1.3/src/test/vhtest/conf/test2.conf
Index: test2.conf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test2.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test2.conf 1997/11/10 02:11:48 1.1
+++ test2.conf 1998/02/08 22:50:14 1.2
@@ -1,7 +1,7 @@
## test more complex ip-vhosts with multiple ports, and name-vhosts on a
## single port of one ip
-Include /home/dgaudet/ap/vhtest/conf/common.conf
+Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf
Listen *:8080
Listen *:8081
@@ -10,26 +10,26 @@
<VirtualHost 127.0.0.1:8080>
ServerName vhost1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1
</VirtualHost>
<VirtualHost 127.0.0.1:8081>
ServerName vhost2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2
</VirtualHost>
<VirtualHost 127.0.0.2:*>
ServerName vhost3
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3
</VirtualHost>
<VirtualHost 127.0.0.3:8080>
ServerName vhost4
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4
</VirtualHost>
<VirtualHost 127.0.0.3:8080 127.0.0.3:8081>
ServerName vhost5
ServerAlias alt5
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost5
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost5
</VirtualHost>
1.2 +8 -8 apache-1.3/src/test/vhtest/conf/test2d.conf
Index: test2d.conf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test2d.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test2d.conf 1997/11/10 02:11:49 1.1
+++ test2d.conf 1998/02/08 22:50:15 1.2
@@ -1,6 +1,6 @@
## same as test2, but throw in a _default_ two port test
-Include /home/dgaudet/ap/vhtest/conf/common.conf
+Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf
Listen *:8080
Listen *:8081
@@ -9,37 +9,37 @@
<VirtualHost 127.0.0.1:8080>
ServerName vhost1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1
</VirtualHost>
<VirtualHost 127.0.0.1:8081>
ServerName vhost2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2
</VirtualHost>
<VirtualHost 127.0.0.2:*>
ServerName vhost3
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3
</VirtualHost>
<VirtualHost 127.0.0.3:8080>
ServerName vhost4
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4
</VirtualHost>
<VirtualHost 127.0.0.3:8080 127.0.0.3:8081>
ServerName vhost5
ServerAlias alt5
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost5
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost5
</VirtualHost>
<VirtualHost _default_:8080>
ServerName default1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/default1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/default1
</VirtualHost>
<VirtualHost _default_:*>
ServerName default2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/default2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/default2
</VirtualHost>
1.2 +6 -6 apache-1.3/src/test/vhtest/conf/test3.conf
Index: test3.conf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test3.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test3.conf 1997/11/10 02:11:49 1.1
+++ test3.conf 1998/02/08 22:50:15 1.2
@@ -1,6 +1,6 @@
## multiple name-vhosts on multiple ports
-Include /home/dgaudet/ap/vhtest/conf/common.conf
+Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf
Listen *:8080
Listen *:8081
@@ -10,25 +10,25 @@
<VirtualHost 127.0.0.1:8080>
ServerName vhost1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1
</VirtualHost>
<VirtualHost 127.0.0.1:8080 127.0.0.1:8081>
ServerName vhost2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2
</VirtualHost>
<VirtualHost 127.0.0.1:8080 127.0.0.1:8081>
ServerName vhost3
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3
</VirtualHost>
<VirtualHost 127.0.0.1:8081>
ServerName vhost4
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4
</VirtualHost>
<VirtualHost 127.0.0.1:8080 127.0.0.1:8081>
ServerName vhost5
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost5
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost5
</VirtualHost>
1.2 +3 -3 apache-1.3/src/test/vhtest/conf/test4.conf
Index: test4.conf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test4.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test4.conf 1997/11/10 02:11:49 1.1
+++ test4.conf 1998/02/08 22:50:16 1.2
@@ -1,6 +1,6 @@
## wildcard namevhost address
-Include /home/dgaudet/ap/vhtest/conf/common.conf
+Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf
Listen *:8080
Listen *:8081
@@ -9,10 +9,10 @@
<VirtualHost 127.0.0.1:*>
ServerName vhost1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1
</VirtualHost>
<VirtualHost 127.0.0.1:*>
ServerName vhost2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2
</VirtualHost>
1.2 +8 -8 apache-1.3/src/test/vhtest/conf/test5.conf
Index: test5.conf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test5.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test5.conf 1997/11/10 02:11:50 1.1
+++ test5.conf 1998/02/08 22:50:16 1.2
@@ -1,7 +1,7 @@
## no ports listed, they should all default to 8080, but we're also listening
## on 8081
-Include /home/dgaudet/ap/vhtest/conf/common.conf
+Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf
Listen 8080
Listen 8081
@@ -10,35 +10,35 @@
<VirtualHost 127.0.0.1>
ServerName vhost1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1
</VirtualHost>
<VirtualHost 127.0.0.1>
ServerName vhost2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2
</VirtualHost>
<VirtualHost 127.0.0.2>
ServerName vhost3
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3
</VirtualHost>
<VirtualHost _default_>
ServerName default1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/default1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/default1
</VirtualHost>
<VirtualHost 127.0.0.1:8081>
ServerName vhost4
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4
</VirtualHost>
<VirtualHost 127.0.0.2:8081>
ServerName vhost5
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost5
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost5
</VirtualHost>
<VirtualHost _default_:8081>
ServerName default2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/default2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/default2
</VirtualHost>
1.2 +8 -9 apache-1.3/src/test/vhtest/conf/test6.conf
Index: test6.conf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test6.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test6.conf 1997/11/10 02:11:50 1.1
+++ test6.conf 1998/02/08 22:50:17 1.2
@@ -1,11 +1,11 @@
-Include /home/dgaudet/ap/vhtest/conf/common.conf
+Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf
## expect a warning about mixing * and non-* ports on vhost 127.0.0.1:8080
NameVirtualHost 127.0.0.1:*
<VirtualHost 127.0.0.1:8080>
ServerName vhost1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1
</VirtualHost>
## expect a warning about mixing * and non-* ports on vhost 127.0.0.2:0
@@ -13,30 +13,29 @@
<VirtualHost 127.0.0.2:*>
ServerName vhost2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2
</VirtualHost>
## expect a warning about overlapping _default_ on port 8080
<VirtualHost _default_>
ServerName default1
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/default1
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/default1
</VirtualHost>
<VirtualHost _default_:8080>
ServerName default2
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/default2
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/default2
</VirtualHost>
## expect a warning about overlapping virtualhosts on 127.0.0.3:8080
<VirtualHost 127.0.0.3>
ServerName vhost3
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3
</VirtualHost>
<VirtualHost 127.0.0.3>
ServerName vhost4
-DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4
+DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4
</VirtualHost>
-## expect all warnings to be printed twice, and probably in the opposite
-## order mentioned here
+## expect all warnings to be printed in the opposite order mentioned here
1.1 apache-1.3/src/test/vhtest/logs/.cvsignore
Index: .cvsignore
===================================================================
*
