clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-09-05 13:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

correctly support python2.4

Browse Source
This commit is contained in:
Unbit
2013-11-01 10:02:35 +01:00
parent 0586a2ba47
commit 94353efb3f
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gevent/gevent.c
+2 -1
View File
@@ -291,8 +291,9 @@ request:
}
end:
if (greenlet_switch)
if (greenlet_switch) {
Py_DECREF(greenlet_switch);
}
end2:
Py_DECREF(current_greenlet);
plugins/python/wsgi_subhandler.c
+12 -2
View File
@@ -18,13 +18,15 @@ extern PyTypeObject uwsgi_InputType;
*/
int uwsgi_python_send_body(struct wsgi_request *wsgi_req, PyObject *chunk) {
char *content = NULL;
size_t content_len = 0;
if (!up.wsgi_accept_buffer && !wsgi_req->is_raw) goto strict;
#if defined(PYTHREE) || defined(Py_TPFLAGS_HAVE_NEWBUFFER)
Py_buffer pbuf;
int has_buffer = 0;
#endif
char *content = NULL;
size_t content_len = 0;
#if defined(PYTHREE) || defined(Py_TPFLAGS_HAVE_NEWBUFFER)
if (PyObject_CheckBuffer(chunk)) {
if (!PyObject_GetBuffer(chunk, &pbuf, PyBUF_SIMPLE)) {
@@ -36,10 +38,18 @@ int uwsgi_python_send_body(struct wsgi_request *wsgi_req, PyObject *chunk) {
}
#else
if (PyObject_CheckReadBuffer(chunk)) {
#ifdef UWSGI_PYTHON_OLD
int buffer_len = 0;
if (!PyObject_AsCharBuffer(chunk, (const char **) &content, &buffer_len)) {
#else
if (!PyObject_AsCharBuffer(chunk, (const char **) &content, (Py_ssize_t *) &content_len)) {
#endif
PyErr_Clear();
goto found;
}
#ifdef UWSGI_PYTHON_OLD
content_len = buffer_len;
#endif
}
#endif