add tagged release 2.3.5
diff --git a/ChangeLog b/ChangeLog
index f43f03f..983a709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-11-11 Massimo Manghi <mxmanghi@apache.org>
+ * : releasing as 2.3.5
+
+2017-11-06 Massimo Manghi <mxmanghi@apache.org>
+ * tests/virtualhost.test,channel.test: fixed <VirtualHost ...>
+ stanzas that caused these tests to fail in certain cases because
+ the Host: header wasn't interpreted correctly
+
2017-10-29 Massimo Manghi <mxmanghi@apache.org>
* win/: removing obsolete directory for windows support
* rivet/init.tcl: recreated from init.tcl.in
diff --git a/tests/channel.test b/tests/channel.test
index 339cf86..df761b2 100644
--- a/tests/channel.test
+++ b/tests/channel.test
@@ -7,12 +7,12 @@
RivetServerConf SeparateVirtualInterps On
RivetServerConf SeparateChannels $sep_channel
NameVirtualHost 127.0.0.1
-<VirtualHost 127.0.0.1>
+<VirtualHost *>
ServerName vhost1
RivetServerConf ChildInitScript \"fconfigure stdout -buffersize 8192\"
</VirtualHost>
-<VirtualHost 127.0.0.1>
+<VirtualHost *>
ServerName vhost2
RivetServerConf ChildInitScript \"fconfigure stdout -buffersize 16384\"
</VirtualHost>
diff --git a/tests/virtualhost.test b/tests/virtualhost.test
index 3323dfd..81a6b47 100644
--- a/tests/virtualhost.test
+++ b/tests/virtualhost.test
@@ -7,12 +7,12 @@
set vhostconf {
#NameVirtualHost 127.0.0.1
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
DocumentRoot $docroot1
ServerName vhost1
</VirtualHost>
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
DocumentRoot $docroot2
ServerName vhost2
</VirtualHost>
@@ -41,12 +41,12 @@
RivetServerConf SeparateVirtualInterps off
RivetServerConf ChildInitScript "source [file join $docroot1 childinit.tcl]"
#NameVirtualHost 127.0.0.1
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
DocumentRoot $docroot1
ServerName vhost1
</VirtualHost>
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
RivetServerConf ChildInitScript "source [file join $docroot2 childinit.tcl]"
DocumentRoot $docroot2
ServerName vhost2
@@ -68,12 +68,12 @@
set data {}
apachetest::start {} {
#NameVirtualHost 127.0.0.1
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
DocumentRoot $docroot1
ServerName vhost1
</VirtualHost>
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
RivetServerConf ChildInitScript "source [file join $docroot2 childinit.tcl]"
DocumentRoot $docroot2
ServerName vhost2
@@ -98,12 +98,12 @@
apachetest::start {} {
RivetServerConf BeforeScript "source [file join $docroot1 beforescript.tcl]"
#NameVirtualHost 127.0.0.1
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
DocumentRoot $docroot1
ServerName vhost1
</VirtualHost>
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
RivetServerConf BeforeScript "source [file join $docroot2 beforescript.tcl]"
DocumentRoot $docroot2
ServerName vhost2
@@ -129,13 +129,13 @@
apachetest::start {} {
RivetServerConf SeparateVirtualInterps on
#NameVirtualHost 127.0.0.1
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
RivetServerConf ChildInitScript "set ::childinit1 1"
DocumentRoot $docroot1
ServerName vhost1
</VirtualHost>
- <VirtualHost 127.0.0.1>
+ <VirtualHost *>
RivetServerConf ChildInitScript "set ::childinit2 1"
DocumentRoot $docroot2
ServerName vhost2
@@ -174,12 +174,12 @@
RivetServerConf SeparateVirtualInterps off
RivetServerConf $conf \"source [file join $docroot1 $file]\"
#NameVirtualHost 127.0.0.1
-<VirtualHost 127.0.0.1>
+<VirtualHost *>
DocumentRoot $docroot1
ServerName vhost1
</VirtualHost>
-<VirtualHost 127.0.0.1>
+<VirtualHost *>
RivetServerConf $conf \"source [file join $docroot2 $file]\"
DocumentRoot $docroot2
ServerName vhost2
@@ -215,12 +215,12 @@
RivetServerConf SeparateVirtualInterps on
RivetServerConf $conf \"source [file join $docroot1 $file]\"
#NameVirtualHost 127.0.0.1
-<VirtualHost 127.0.0.1>
+<VirtualHost *>
DocumentRoot $docroot1
ServerName vhost1
</VirtualHost>
-<VirtualHost 127.0.0.1>
+<VirtualHost *>
RivetServerConf $conf \"source [file join $docroot2 $file]\"
DocumentRoot $docroot2
ServerName vhost2
