mirrors
/
kore
mirror of https://git.kore.io/kore.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Always use http_response_stream() in req.response. 

Keep around the python bytes object while we stream the contents
of it out over the wire. This avoids an entire copy of the data.
This commit is contained in:
Joris Vink 2018-11-14 10:03:32 +01:00
parent 966eaf8f7a
commit cb482d8e8f
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/python.c
View File

@ -37,6 +37,7 @@ static PyObject *python_import(const char *);
static PyObject *pyconnection_alloc(struct connection *);
static PyObject *python_callable(PyObject *, const char *);
static int pyhttp_response_sent(struct netbuf *);
static PyObject *pyhttp_file_alloc(struct http_file *);
static PyObject *pyhttp_request_alloc(const struct http_request *);
@ -2544,24 +2545,43 @@ pyhttp_file_alloc(struct http_file *file)
static PyObject *
pyhttp_response(struct pyhttp_request *pyreq, PyObject *args)
{
const char *body;
int status, len;
char *ptr;
PyObject *data;
Py_ssize_t length;
int status;
len = -1;
length = -1;
if (!PyArg_ParseTuple(args, "iy#", &status, &body, &len))
if (!PyArg_ParseTuple(args, "iS", &status, &data))
return (NULL);
if (len < 0) {
if (PyBytes_AsStringAndSize(data, &ptr, &length) == -1)
return (NULL);
if (length < 0) {
PyErr_SetString(PyExc_TypeError, "invalid length");
return (NULL);
}
http_response(pyreq->req, status, body, len);
Py_INCREF(data);
http_response_stream(pyreq->req, status, ptr, length,
pyhttp_response_sent, data);
Py_RETURN_TRUE;
}
static int
pyhttp_response_sent(struct netbuf *nb)
{
PyObject *data;
data = nb->extra;
Py_DECREF(data);
return (KORE_RESULT_OK);
}
static PyObject *
pyhttp_response_header(struct pyhttp_request *pyreq, PyObject *args)
{