Merged with the default branch.

1 files changed, 41 insertions, 29 deletions

diff --git a/src/python/nxt_python_asgi.c b/src/python/nxt_python_asgi.c
index 4ad0857d..587a17cf 100644
--- a/src/python/nxt_python_asgi.c
+++ b/src/python/nxt_python_asgi.c
@@ -27,7 +27,8 @@ static void nxt_py_asgi_remove_reader(nxt_unit_ctx_t *ctx,
 static void nxt_py_asgi_request_handler(nxt_unit_request_info_t *req);
 static void nxt_py_asgi_close_handler(nxt_unit_request_info_t *req);
 
-static PyObject *nxt_py_asgi_create_http_scope(nxt_unit_request_info_t *req);
+static PyObject *nxt_py_asgi_create_http_scope(nxt_unit_request_info_t *req,
+    nxt_python_target_t *app_target);
 static PyObject *nxt_py_asgi_create_address(nxt_unit_sptr_t *sptr, uint8_t len,
     uint16_t port);
 static PyObject *nxt_py_asgi_create_ip_address(nxt_unit_sptr_t *sptr,
@@ -455,16 +456,16 @@ nxt_py_asgi_request_handler(nxt_unit_request_info_t *req)
         goto release_send;
     }
 
-    scope = nxt_py_asgi_create_http_scope(req);
+    req->data = asgi;
+    target = &nxt_py_targets->target[req->request->app_target];
+
+    scope = nxt_py_asgi_create_http_scope(req, target);
     if (nxt_slow_path(scope == NULL)) {
         nxt_unit_request_done(req, NXT_UNIT_ERROR);
 
         goto release_done;
     }
 
-    req->data = asgi;
-    target = &nxt_py_targets->target[req->request->app_target];
-
     if (!target->asgi_legacy) {
         nxt_unit_req_debug(req, "Python call ASGI 3.0 application");
 
@@ -573,12 +574,14 @@ nxt_py_asgi_close_handler(nxt_unit_request_info_t *req)
 
 
 static PyObject *
-nxt_py_asgi_create_http_scope(nxt_unit_request_info_t *req)
+nxt_py_asgi_create_http_scope(nxt_unit_request_info_t *req,
+    nxt_python_target_t *app_target)
 {
     char                *p, *target, *query;
-    uint32_t            target_length, i;
+    uint32_t            target_length, i, path_length;
     PyObject            *scope, *v, *type, *scheme;
     PyObject            *headers, *header;
+    nxt_str_t           prefix;
     nxt_unit_field_t    *f;
     nxt_unit_request_t  *r;
 
@@ -612,6 +615,17 @@ nxt_py_asgi_create_http_scope(nxt_unit_request_info_t *req)
         return NULL;
     }
 
+    prefix = app_target->prefix;
+    path_length = r->path_length;
+    p = nxt_unit_sptr_get(&r->path);
+    if (prefix.length > 0
+        && ((path_length > prefix.length && p[prefix.length] == '/')
+            || path_length == prefix.length)
+        && memcmp(prefix.start, p, prefix.length) == 0)
+    {
+        SET_ITEM(scope, root_path, app_target->py_prefix);
+    }
+
     p = nxt_unit_sptr_get(&r->version);
     SET_ITEM(scope, http_version, p[7] == '1' ? nxt_py_1_1_str
                                               : nxt_py_1_0_str)
@@ -674,7 +688,7 @@ nxt_py_asgi_create_http_scope(nxt_unit_request_info_t *req)
     SET_ITEM(scope, client, v)
     Py_DECREF(v);
 
-    v = nxt_py_asgi_create_address(&r->local, r->local_length, 80);
+    v = nxt_py_asgi_create_address(&r->local_addr, r->local_addr_length, 80);
     if (nxt_slow_path(v == NULL)) {
         nxt_unit_req_alert(req, "Python failed to create 'server' pair");
         goto fail;
@@ -738,42 +752,40 @@ fail:
 static PyObject *
 nxt_py_asgi_create_address(nxt_unit_sptr_t *sptr, uint8_t len, uint16_t port)
 {
+#if (NXT_HAVE_UNIX_DOMAIN)
     size_t     prefix_len;
-    nxt_str_t  addr;
     PyObject   *pair, *v;
+    nxt_str_t  addr;
 
     addr.length = len;
     addr.start = nxt_unit_sptr_get(sptr);
 
     prefix_len = nxt_length("unix:");
-    if (!nxt_str_start(&addr, "unix:", prefix_len)) {
-        return nxt_py_asgi_create_ip_address(sptr, len, port);
-    }
+    if (nxt_str_start(&addr, "unix:", prefix_len)) {
 
-#if NXT_HAVE_UNIX_DOMAIN
-    pair = PyTuple_New(2);
-    if (nxt_slow_path(pair == NULL)) {
-        return NULL;
-    }
+        pair = PyTuple_New(2);
+        if (nxt_slow_path(pair == NULL)) {
+            return NULL;
+        }
 
-    addr.start += prefix_len;
-    addr.length -= prefix_len;
+        addr.start += prefix_len;
+        addr.length -= prefix_len;
 
-    v = PyString_FromStringAndSize((const char *) addr.start, addr.length);
-    if (nxt_slow_path(v == NULL)) {
-        Py_DECREF(pair);
+        v = PyString_FromStringAndSize((const char *) addr.start, addr.length);
+        if (nxt_slow_path(v == NULL)) {
+            Py_DECREF(pair);
 
-        return NULL;
-    }
+            return NULL;
+        }
 
-    PyTuple_SET_ITEM(pair, 0, v);
-    PyTuple_SET_ITEM(pair, 1, Py_None);
+        PyTuple_SET_ITEM(pair, 0, v);
+        PyTuple_SET_ITEM(pair, 1, Py_None);
 
-    return pair;
+        return pair;
+    }
 
-#else
-    return NULL;
 #endif
+    return nxt_py_asgi_create_ip_address(sptr, len, port);
 }