Skip to content

Follow https://github.com/django/asgiref/issues/229#issuecomment-765583185 #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abersheeran merged 2 commits into from
Dec 6, 2023
Merged

Follow https://github.com/django/asgiref/issues/229#issuecomment-765583185 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9beb136
Follow https://github.com/django/asgiref/issues/229#issuecomment-7655…
abersheeran Dec 6, 2023
6aa5408
Delete undefined var
abersheeran Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions a2wsgi/asgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,19 @@ def build_scope(environ: Environ) -> Scope:
else:
client = None

root_path = environ.get("SCRIPT_NAME", "").encode("latin1").decode("utf8")
path = root_path + environ["PATH_INFO"].encode("latin1").decode("utf8")

return {
"wsgi_environ": environ,
"type": "http",
"asgi": {"version": "3.0", "spec_version": "3.0"},
"http_version": environ.get("SERVER_PROTOCOL", "http/1.0").split("/")[1],
"method": environ["REQUEST_METHOD"],
"scheme": environ.get("wsgi.url_scheme", "http"),
"path": environ["PATH_INFO"].encode("latin1").decode("utf8"),
"path": path,
"query_string": environ["QUERY_STRING"].encode("ascii"),
"root_path": environ.get("SCRIPT_NAME", "").encode("latin1").decode("utf8"),
"root_path": root_path,
"client": client,
"server": (environ["SERVER_NAME"], int(environ["SERVER_PORT"])),
"headers": headers,
Expand Down
20 changes: 11 additions & 9 deletions a2wsgi/wsgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,20 @@ def build_environ(scope: Scope, body: Body) -> Environ:
"""
Builds a scope and request body into a WSGI environ object.
"""
allow_rewrite_environ = {
"SCRIPT_NAME": scope.get("root_path", "").encode("utf8").decode("latin1"),
}
for key in allow_rewrite_environ.keys():
environ_var = os.environ.get(key, "")
if environ_var:
allow_rewrite_environ[key] = unicode_to_wsgi(environ_var)
script_name = scope.get("root_path", "").encode("utf8").decode("latin1")
path_info = scope["path"].encode("utf8").decode("latin1")
if path_info.startswith(script_name):
path_info = path_info[len(script_name):]

script_name_environ_var = os.environ.get("SCRIPT_NAME", "")
if script_name_environ_var:
script_name = unicode_to_wsgi(script_name_environ_var)

environ = {
**allow_rewrite_environ,
"asgi.scope": scope,
"REQUEST_METHOD": scope["method"],
"PATH_INFO": scope["path"].encode("utf8").decode("latin1"),
"SCRIPT_NAME": script_name,
"PATH_INFO": path_info,
"QUERY_STRING": scope["query_string"].decode("ascii"),
"SERVER_PROTOCOL": f"HTTP/{scope['http_version']}",
"wsgi.version": (1, 0),
Expand Down