From c0b079deb07e7b50d978d77038e8f5876dd18e98 Mon Sep 17 00:00:00 2001 From: Unbit Date: Tue, 2 Jul 2013 16:22:20 +0200 Subject: [PATCH] backported python3 latin1 fix from 1.9 --- plugins/python/uwsgi_pymodule.c | 2 +- plugins/python/wsgi_headers.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/python/uwsgi_pymodule.c b/plugins/python/uwsgi_pymodule.c index e77be5e4..d9bdb4a6 100644 --- a/plugins/python/uwsgi_pymodule.c +++ b/plugins/python/uwsgi_pymodule.c @@ -842,7 +842,7 @@ PyObject *py_uwsgi_advanced_sendfile(PyObject * self, PyObject * args) { } #ifdef PYTHREE else if (PyUnicode_Check(what)) { - filename = PyBytes_AsString(PyUnicode_AsASCIIString(what)); + filename = PyBytes_AsString(PyUnicode_AsLatin1String(what)); fd = open(filename, O_RDONLY); if (fd < 0) { diff --git a/plugins/python/wsgi_headers.c b/plugins/python/wsgi_headers.c index 937197d4..346cb59e 100644 --- a/plugins/python/wsgi_headers.c +++ b/plugins/python/wsgi_headers.c @@ -100,7 +100,7 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) { wsgi_req->hvec[1].iov_len = 1; #ifdef PYTHREE if (self != Py_None) { - PyObject *zero = PyUnicode_AsASCIIString(head); + PyObject *zero = PyUnicode_AsLatin1String(head); wsgi_req->hvec[2].iov_base = PyBytes_AsString(zero); PyList_Append((PyObject *) wsgi_req->gc_tracker, zero); Py_DECREF(zero); @@ -124,7 +124,7 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) { wsgi_req->hvec[0].iov_len = 8; #ifdef PYTHREE if (self != Py_None) { - PyObject *zero = PyUnicode_AsASCIIString(head); + PyObject *zero = PyUnicode_AsLatin1String(head); wsgi_req->hvec[1].iov_base = PyBytes_AsString(zero); PyList_Append((PyObject *) wsgi_req->gc_tracker, zero); Py_DECREF(zero); @@ -198,7 +198,7 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) { #ifdef PYTHREE if (self != Py_None) { - PyObject *zero = PyUnicode_AsASCIIString(h_key); + PyObject *zero = PyUnicode_AsLatin1String(h_key); wsgi_req->hvec[j].iov_base = PyBytes_AsString(zero); PyList_Append((PyObject *) wsgi_req->gc_tracker, zero); Py_DECREF(zero); @@ -215,7 +215,7 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) { wsgi_req->hvec[j + 1].iov_len = H_SEP_SIZE; #ifdef PYTHREE if (self != Py_None) { - PyObject *zero = PyUnicode_AsASCIIString(h_value); + PyObject *zero = PyUnicode_AsLatin1String(h_value); wsgi_req->hvec[j + 2].iov_base = PyBytes_AsString(zero); PyList_Append((PyObject *) wsgi_req->gc_tracker, zero); Py_DECREF(zero);