Python: improving ASGI http send message processing.

1 files changed, 13 insertions, 12 deletions

diff --git a/src/python/nxt_python_asgi_http.c b/src/python/nxt_python_asgi_http.c
index 5ea8e0a5..d88c4b00 100644
--- a/src/python/nxt_python_asgi_http.c
+++ b/src/python/nxt_python_asgi_http.c
@@ -262,22 +262,23 @@ nxt_py_asgi_http_send(PyObject *self, PyObject *dict)
     nxt_unit_req_debug(http->req, "asgi_http_send type is '%.*s'",
                        (int) type_len, type_str);
 
-    if (type_len == (Py_ssize_t) response_start.length
-        && memcmp(type_str, response_start.start, type_len) == 0)
-    {
-        return nxt_py_asgi_http_response_start(http, dict);
-    }
+    if (nxt_unit_response_is_init(http->req)) {
+        if (nxt_str_eq(&response_body, type_str, (size_t) type_len)) {
+            return nxt_py_asgi_http_response_body(http, dict);
+        }
 
-    if (type_len == (Py_ssize_t) response_body.length
-        && memcmp(type_str, response_body.start, type_len) == 0)
-    {
-        return nxt_py_asgi_http_response_body(http, dict);
+        return PyErr_Format(PyExc_RuntimeError,
+                            "Expected ASGI message 'http.response.body', "
+                            "but got '%U'", type);
     }
 
-    nxt_unit_req_error(http->req, "asgi_http_send: unexpected 'type': '%.*s'",
-                       (int) type_len, type_str);
+    if (nxt_str_eq(&response_start, type_str, (size_t) type_len)) {
+        return nxt_py_asgi_http_response_start(http, dict);
+    }
 
-    return PyErr_Format(PyExc_AssertionError, "unexpected 'type': '%U'", type);
+    return PyErr_Format(PyExc_RuntimeError,
+                        "Expected ASGI message 'http.response.start', "
+                        "but got '%U'", type);
 }