Repositories / mmondor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 753d94e)
*** empty log message ***
authorMatthew Mondor <mmondor@pulsar-zone.net>
Sun, 10 Jul 2005 02:31:33 +0000 (02:31 +0000)
committerMatthew Mondor <mmondor@pulsar-zone.net>
Sun, 10 Jul 2005 02:31:33 +0000 (02:31 +0000)
tests/js-test/js/httpd/httpd.js patch | blob | blame | history

diff --git a/tests/js-test/js/httpd/httpd.js b/tests/js-test/js/httpd/httpd.js
index d95111c..964edef 100644 (file)
--- a/tests/js-test/js/httpd/httpd.js
+++ b/tests/js-test/js/httpd/httpd.js
@@ -1,4 +1,4 @@
-/* $Id: httpd.js,v 1.47 2005/07/10 01:58:25 mmondor Exp $ */
+/* $Id: httpd.js,v 1.48 2005/07/10 02:31:33 mmondor Exp $ */
 
 /*
  * Copyright (c) 2005, Matthew Mondor
@@ -111,7 +111,7 @@ eval(file_read('root.js'));         /* Root object for virtual chroot(2) */
  * Server identification
  */
 SERVER_VERSION                 = 'mmondor_js_httpd/0.0.1 (NetBSD)';
-SERVER_CVSID   = '$Id: httpd.js,v 1.47 2005/07/10 01:58:25 mmondor Exp $';
+SERVER_CVSID   = '$Id: httpd.js,v 1.48 2005/07/10 02:31:33 mmondor Exp $';
 
 
 
@@ -678,6 +678,16 @@ FD.prototype.parseRequest = function(time)
        }
 
        /*
+        * If no Host: line set the vhost, set the default one.
+        * If there is a vhost set, but is unknown, also set the default one.
+        * Also set the name of the vhost to the actual vhost name despite
+        * it possibly being resolved through an alias.
+        */
+       if (vhost == '' || vhosts_table[vhost] == undefined)
+               vhost = options.default_vhost;
+       this.http_vhost = vhosts_table[vhost.toLowerCase()];
+
+       /*
         * Block out evil Microsoft products
         */
        if (evil) {
@@ -698,16 +708,6 @@ FD.prototype.parseRequest = function(time)
        }
 
        /*
-        * If no Host: line set the vhost, set the default one.
-        * If there is a vhost set, but is unknown, also set the default one.
-        * Also set the name of the vhost to the actual vhost name despite
-        * it possibly being resolved through an alias.
-        */
-       if (vhost == '' || vhosts_table[vhost] == undefined)
-               vhost = options.default_vhost;
-       this.http_vhost = vhosts_table[vhost.toLowerCase()];
-
-       /*
         * Verify if client sent a session cookie, and if it consists of a
         * valid one, load session data.
         */
MMSoftware