Allowed more characters for map/upstream/etc directives

rongfengliang · May 14, 2017 · 7d8fb88 · 7d8fb88
1 parent 3c1437c
commit 7d8fb88
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/gixy/parser/raw_parser.py b/gixy/parser/raw_parser.py
@@ -135,7 +135,7 @@ def script(self):
 
         hash_block << (
             keyword +
-            Group(OneOrMore(space + variable)) +
+            Group(OneOrMore(space + value)) +
             Group(
                 left_bracket +
                 Optional(OneOrMore(hash_value)) +
@@ -144,7 +144,7 @@ def script(self):
 
         generic_block << (
             keyword +
-            Group(ZeroOrMore(space + variable)) +
+            Group(ZeroOrMore(space + value)) +
             Group(
                 left_bracket +
                 Optional(sub_block) +
@@ -153,7 +153,7 @@ def script(self):
 
         unparsed_block << (
             keyword +
-            Group(ZeroOrMore(space + variable)) +
+            Group(ZeroOrMore(space + value)) +
             nestedExpr(opener="{", closer="}")
         )("unparsed_block")
 

diff --git a/tests/parser/test_raw_parser.py b/tests/parser/test_raw_parser.py
@@ -497,6 +497,22 @@ def test_comments():
     assert_config(config, expected)
 
 
+def test_upstream_dot():
+    config = '''
+upstream test.mysite.com {
+    server 127.0.0.1:9009;
+}
+        '''
+
+    expected = [
+        ['upstream', ['test.mysite.com'], [
+            ['server', '127.0.0.1:9009']
+        ]],
+    ]
+
+    assert_config(config, expected)
+
+
 def test_empty_config():
     config = '''
         '''