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

improved wsgi.input reports

Browse Source
This commit is contained in:
Roberto De Ioris
2012-10-23 20:44:01 +02:00
parent 3a451fb42f
commit d6b4b8ea6e
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/python/uwsgi_python.h
+2 -2
View File
@@ -187,7 +187,7 @@ struct uwsgi_python {
int start_response_nodelay;
void (*hook_write_string)(struct wsgi_request *, PyObject *);
ssize_t (*hook_wsgi_input_read)(struct wsgi_request *, char *, size_t);
ssize_t (*hook_wsgi_input_read)(struct wsgi_request *, char *, size_t, size_t *);
ssize_t (*hook_wsgi_input_readline)(struct wsgi_request *, char *, size_t);
char *programname;
@@ -281,7 +281,7 @@ int uwsgi_python_do_send_headers(struct wsgi_request *);
void *uwsgi_python_tracebacker_thread(void *);
PyObject *uwsgi_python_setup_thread(char *);
ssize_t uwsgi_python_hook_simple_input_read(struct wsgi_request *, char *, size_t);
ssize_t uwsgi_python_hook_simple_input_read(struct wsgi_request *, char *, size_t, size_t *);
ssize_t uwsgi_python_hook_simple_input_readline(struct wsgi_request *, char *, size_t);
#ifdef UWSGI_PYPY
plugins/python/wsgi_handlers.c
+8 -10
View File
@@ -98,9 +98,7 @@ static void uwsgi_Input_free(uwsgi_Input *self) {
PyObject_Del(self);
}
ssize_t uwsgi_python_hook_simple_input_read(struct wsgi_request *wsgi_req, char *tmp_buf, size_t remains) {
size_t tmp_pos = 0;
ssize_t uwsgi_python_hook_simple_input_read(struct wsgi_request *wsgi_req, char *tmp_buf, size_t remains, size_t *tmp_pos) {
UWSGI_RELEASE_GIL
@@ -110,17 +108,17 @@ ssize_t uwsgi_python_hook_simple_input_read(struct wsgi_request *wsgi_req, char
return 0;
}
ssize_t rlen = read(wsgi_req->poll.fd, tmp_buf+tmp_pos, remains);
ssize_t rlen = read(wsgi_req->poll.fd, tmp_buf+*tmp_pos, remains);
if (rlen <= 0) {
UWSGI_GET_GIL
return -1;
}
tmp_pos += rlen;
*tmp_pos += rlen;
remains -= rlen;
}
UWSGI_GET_GIL
return tmp_pos;
return *tmp_pos;
}
@@ -128,7 +126,7 @@ static PyObject *uwsgi_Input_read(uwsgi_Input *self, PyObject *args) {
long len = 0;
size_t remains;
ssize_t tmp_pos = 0;
size_t tmp_pos = 0;
char *tmp_buf;
PyObject *res;
@@ -179,10 +177,10 @@ static PyObject *uwsgi_Input_read(uwsgi_Input *self, PyObject *args) {
tmp_buf = uwsgi_malloc(remains);
tmp_pos = up.hook_wsgi_input_read(self->wsgi_req, tmp_buf, remains);
if (tmp_pos < 0) {
ssize_t rlen = up.hook_wsgi_input_read(self->wsgi_req, tmp_buf, remains, &tmp_pos);
if (rlen < 0) {
free(tmp_buf);
return PyErr_Format(PyExc_IOError, "error reading for wsgi.input data: Content-Length %llu requested %llu received %llu", (unsigned long long) self->wsgi_req->post_cl, (unsigned long long) (remains + (tmp_pos+1)), (unsigned long long) (tmp_pos+1));
return PyErr_Format(PyExc_IOError, "error reading for wsgi.input data: Content-Length %llu requested %llu received %llu", (unsigned long long) self->wsgi_req->post_cl, (unsigned long long) (remains + tmp_pos), (unsigned long long) tmp_pos);
}
else if (tmp_pos == 0) {
free(tmp_buf);