Merged with the default branch.

4 files changed, 51 insertions, 0 deletions

diff --git a/test/python/prefix/asgi.py b/test/python/prefix/asgi.py
new file mode 100644
index 00000000..234f084f
--- /dev/null
+++ b/test/python/prefix/asgi.py
@@ -0,0 +1,15 @@
+async def application(scope, receive, send):
+    assert scope['type'] == 'http'
+
+    await send(
+        {
+            'type': 'http.response.start',
+            'status': 200,
+            'headers': [
+                (b'content-length', b'0'),
+                (b'prefix', scope.get('root_path', 'NULL').encode()),
+            ],
+        }
+    )
+
+    await send({'type': 'http.response.body', 'body': b''})
diff --git a/test/python/prefix/wsgi.py b/test/python/prefix/wsgi.py
new file mode 100644
index 00000000..83b58c9a
--- /dev/null
+++ b/test/python/prefix/wsgi.py
@@ -0,0 +1,10 @@
+def application(environ, start_response):
+    start_response(
+        '200',
+        [
+            ('Content-Length', '0'),
+            ('Script-Name', environ.get('SCRIPT_NAME', 'NULL')),
+            ('Path-Info', environ['PATH_INFO']),
+        ],
+    )
+    return []
diff --git a/test/python/targets/asgi.py b/test/python/targets/asgi.py
index b51f3964..749ec5b1 100644
--- a/test/python/targets/asgi.py
+++ b/test/python/targets/asgi.py
@@ -22,6 +22,23 @@ async def application_200(scope, receive, send):
     )
 
 
+async def application_prefix(scope, receive, send):
+    assert scope['type'] == 'http'
+
+    await send(
+        {
+            'type': 'http.response.start',
+            'status': 200,
+            'headers': [
+                (b'content-length', b'0'),
+                (b'prefix', scope.get('root_path', 'NULL').encode()),
+            ],
+        }
+    )
+
+    await send({'type': 'http.response.body', 'body': b''})
+
+
 def legacy_application_200(scope):
     assert scope['type'] == 'http'
 
diff --git a/test/python/targets/wsgi.py b/test/python/targets/wsgi.py
index fa17ab87..3f3d4b27 100644
--- a/test/python/targets/wsgi.py
+++ b/test/python/targets/wsgi.py
@@ -6,3 +6,12 @@ def wsgi_target_a(env, start_response):
 def wsgi_target_b(env, start_response):
     start_response('200', [('Content-Length', '1')])
     return [b'2']
+
+
+def wsgi_target_prefix(env, start_response):
+    data = u'%s %s' % (
+        env.get('SCRIPT_NAME', 'No Script Name'),
+        env['PATH_INFO'],
+    )
+    start_response('200', [('Content-Length', '%d' % len(data))])
+    return [data.encode('utf-8')]