5 files changed, 88 insertions, 0 deletions
diff --git a/test/php/query_string/index.php b/test/php/query_string/index.php
new file mode 100644
index 00000000..5691324d
--- /dev/null
+++ b/test/php/query_string/index.php
@@ -0,0 +1,4 @@
+<?php
+header('Content-Length: 0');
+header('Query-String: ' . $_SERVER['QUERY_STRING']);
+?>
diff --git a/test/test_perl_application.py b/test/test_perl_application.py
index c9cb3f0c..2dfae66c 100644
--- a/test/test_perl_application.py
+++ b/test/test_perl_application.py
@@ -55,6 +55,25 @@ class TestUnitPerlApplication(unit.TestUnitApplicationPerl):
         self.assertEqual(resp['headers']['Query-String'], 'var1=val1&var2=val2',
             'Query-String header')
 
+    def test_perl_application_query_string_empty(self):
+        self.load('query_string')
+
+        resp = self.get(url='/?')
+
+        self.assertEqual(resp['status'], 200, 'query string empty status')
+        self.assertEqual(resp['headers']['Query-String'], '',
+            'query string empty')
+
+    @unittest.expectedFailure
+    def test_perl_application_query_string_absent(self):
+        self.load('query_string')
+
+        resp = self.get()
+
+        self.assertEqual(resp['status'], 200, 'query string absent status')
+        self.assertEqual(resp['headers']['Query-String'], '',
+            'query string absent')
+
     @unittest.expectedFailure
     def test_perl_application_server_port(self):
         self.load('server_port')
diff --git a/test/test_php_application.py b/test/test_php_application.py
index e0058d9a..ba9c03b3 100644
--- a/test/test_php_application.py
+++ b/test/test_php_application.py
@@ -48,6 +48,33 @@ class TestUnitPHPApplication(unit.TestUnitApplicationPHP):
         }, 'headers')
         self.assertEqual(resp['body'], body, 'body')
 
+    def test_php_application_query_string(self):
+        self.load('query_string')
+
+        resp = self.get(url='/?var1=val1&var2=val2')
+
+        self.assertEqual(resp['headers']['Query-String'], 'var1=val1&var2=val2',
+            'query string')
+
+    def test_php_application_query_string_empty(self):
+        self.load('query_string')
+
+        resp = self.get(url='/?')
+
+        self.assertEqual(resp['status'], 200, 'query string empty status')
+        self.assertEqual(resp['headers']['Query-String'], '',
+            'query string empty')
+
+    @unittest.expectedFailure
+    def test_php_application_query_string_absent(self):
+        self.load('query_string')
+
+        resp = self.get()
+
+        self.assertEqual(resp['status'], 200, 'query string absent status')
+        self.assertEqual(resp['headers']['Query-String'], '',
+            'query string absent')
+
     def test_php_application_phpinfo(self):
         self.load('phpinfo')
 
diff --git a/test/test_python_application.py b/test/test_python_application.py
index 667047bc..9c2c762d 100644
--- a/test/test_python_application.py
+++ b/test/test_python_application.py
@@ -53,6 +53,25 @@ class TestUnitPythonApplication(unit.TestUnitApplicationPython):
         self.assertEqual(resp['headers']['Query-String'], 'var1=val1&var2=val2',
             'Query-String header')
 
+    def test_python_application_query_string_empty(self):
+        self.load('query_string')
+
+        resp = self.get(url='/?')
+
+        self.assertEqual(resp['status'], 200, 'query string empty status')
+        self.assertEqual(resp['headers']['Query-String'], '',
+            'query string empty')
+
+    @unittest.expectedFailure
+    def test_python_application_query_string_absent(self):
+        self.load('query_string')
+
+        resp = self.get()
+
+        self.assertEqual(resp['status'], 200, 'query string absent status')
+        self.assertEqual(resp['headers']['Query-String'], '',
+            'query string absent')
+
     @unittest.expectedFailure
     def test_python_application_server_port(self):
         self.load('server_port')
diff --git a/test/test_ruby_application.py b/test/test_ruby_application.py
index 57ab88cd..b88e043d 100644
--- a/test/test_ruby_application.py
+++ b/test/test_ruby_application.py
@@ -56,6 +56,25 @@ class TestUnitRubyApplication(unit.TestUnitApplicationRuby):
         self.assertEqual(resp['headers']['Query-String'], 'var1=val1&var2=val2',
             'Query-String header')
 
+    def test_ruby_application_query_string_empty(self):
+        self.load('query_string')
+
+        resp = self.get(url='/?')
+
+        self.assertEqual(resp['status'], 200, 'query string empty status')
+        self.assertEqual(resp['headers']['Query-String'], '',
+            'query string empty')
+
+    @unittest.expectedFailure
+    def test_ruby_application_query_string_absent(self):
+        self.load('query_string')
+
+        resp = self.get()
+
+        self.assertEqual(resp['status'], 200, 'query string absent status')
+        self.assertEqual(resp['headers']['Query-String'], '',
+            'query string absent')
+
     @unittest.expectedFailure
     def test_ruby_application_server_port(self):
         self.load('server_port')