Changeset 630

Timestamp:

01/19/07 18:17:58 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/contrib/05to06.py (modified) (5 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2007-01-19  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * contrib/05to06.py: Adds a faked DocumentRoot if the virtual
+        server didn't contain one.  0.5 wasn't checking for a
+        document_root but 0.6 does. It is no more than a work around.
-
-        * contrib/05to06.py: Now, it adds the "priority" entry to all the

cherokee/trunk/contrib/05to06.py

@@ -10 +10 @@
-import sys
-import string
+
+FAKED_DOCUMENT_ROOT = '/faked'
+
-
-class Syntax:
@@ -34 +37 @@
-
-    vsrv_entries =    {'directoryindex':        'list',
-                       'documentroot':          'path',
-                       'sslcertificatefile':    'path',
-                       'sslcertificatekeyfile': 'path',
@@ -387 +389 @@
-            print "vserver!%s!%s = %s" % (vserver, kind, str(val_val))
-
+        elif kind == 'documentroot':
+            kind, val = self._lex.get_token()
+            if kind != 'path': raise "Malformed DocumentRoot"
+
+            print "vserver!%s!document_root = %s" % (vserver, val)
+            self._vserver_has_document_root = True
+
-        elif kind == 'directory':
-            kind, dir_val = self._lex.get_token()
@@ -623 +632 @@
-            print "vserver!%s!domain!%d = %s" % (vserver, i, v)
-
+        self._vserver_has_document_root = False
+
-        while True:
-            more = self._process_virtual_server_content (vserver)
@@ -630 +641 @@
-        if kind != '}': raise "Expected }, got %s=%s" % (kind,val)
-
+        if not self._vserver_has_document_root:
+            print "vserver!%s!document_root = %s" % (vserver, FAKED_DOCUMENT_ROOT)
-
-    def process_sentence (self):