Skip to content

Decode query string as UTF8 #44

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
grisha merged 3 commits into from
May 7, 2015
Merged

Decode query string as UTF8 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
732533a
Decode query string as UTF8
lovasoa May 5, 2015
120f66f
Fix bug with query string parameters in python3
lovasoa May 7, 2015
dcb4ceb
Add a comment about query string encoding
lovasoa May 7, 2015
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
2 changes: 1 addition & 1 deletion lib/python/mod_python/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class StringField(bytes):
disp_options = None

def __new__(self, value):
return bytes.__new__(self, value)
return bytes.__new__(self, value, "utf8")

def __init__(self, value):
self.value = value
Expand Down
10 changes: 6 additions & 4 deletions src/_apachemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,11 @@ static PyObject *parse_qs(PyObject *self, PyObject *args)
cval = PyBytes_AS_STRING(val);

if (unicode) {
// The query string is supposed to be a valid UTF8 string
// https://url.spec.whatwg.org/#percent-encoded-bytes
PyObject *list, *ukey, *uval;
ukey = PyUnicode_DecodeLatin1(ckey, strlen(ckey), NULL);
uval = PyUnicode_DecodeLatin1(ckey, strlen(cval), NULL);
ukey = PyUnicode_DecodeUTF8(ckey, strlen(ckey), NULL);
uval = PyUnicode_DecodeUTF8(ckey, strlen(cval), NULL);
list = PyDict_GetItem(dict, ukey);
if (list) {
PyList_Append(list, uval);
Expand Down Expand Up @@ -371,8 +373,8 @@ static PyObject *parse_qsl(PyObject *self, PyObject *args)
PyObject *listitem = NULL;
if (unicode) {
PyObject *ukey, *uval;
ukey = PyUnicode_DecodeLatin1(ckey, strlen(ckey), NULL);
uval = PyUnicode_DecodeLatin1(cval, strlen(cval), NULL);
ukey = PyUnicode_DecodeUTF8(ckey, strlen(ckey), NULL);
uval = PyUnicode_DecodeUTF8(cval, strlen(cval), NULL);
listitem = Py_BuildValue("(O,O)", ukey, uval);
Py_DECREF(ukey);
Py_DECREF(uval);
Expand Down