You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2017/11/06 22:11:46 UTC

svn commit: r1814443 - in /tcl/rivet/branches/2.3: ChangeLog tests/channel.test tests/virtualhost.test

Author: mxmanghi
Date: Mon Nov  6 22:11:46 2017
New Revision: 1814443

URL: http://svn.apache.org/viewvc?rev=1814443&view=rev
Log:
    * 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


Modified:
    tcl/rivet/branches/2.3/ChangeLog
    tcl/rivet/branches/2.3/tests/channel.test
    tcl/rivet/branches/2.3/tests/virtualhost.test

Modified: tcl/rivet/branches/2.3/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/ChangeLog?rev=1814443&r1=1814442&r2=1814443&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/ChangeLog (original)
+++ tcl/rivet/branches/2.3/ChangeLog Mon Nov  6 22:11:46 2017
@@ -1,3 +1,8 @@
+2017-11-06 Massimo Manghi <mx...@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 <mx...@apache.org>
     * win/: removing obsolete directory for windows support
     * rivet/init.tcl: recreated from init.tcl.in

Modified: tcl/rivet/branches/2.3/tests/channel.test
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/tests/channel.test?rev=1814443&r1=1814442&r2=1814443&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/tests/channel.test (original)
+++ tcl/rivet/branches/2.3/tests/channel.test Mon Nov  6 22:11:46 2017
@@ -7,12 +7,12 @@ foreach {sep_channel offset_value} {On 0
 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>

Modified: tcl/rivet/branches/2.3/tests/virtualhost.test
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/tests/virtualhost.test?rev=1814443&r1=1814442&r2=1814443&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/tests/virtualhost.test (original)
+++ tcl/rivet/branches/2.3/tests/virtualhost.test Mon Nov  6 22:11:46 2017
@@ -7,12 +7,12 @@ set docroot2 [file join [pwd] docroot2]
 
 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 @@ set vhostconf {
         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 vhostconf {
     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 @@ set vhostconf {
     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 @@ set vhostconf {
     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 @@ foreach {conf file re1 re2} $configs {
 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 @@ foreach {conf file re1 re2} $configs {
 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



---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org