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

merge

Browse Source
This commit is contained in:
roberto@fiorenzo
2010-09-16 09:03:12 +02:00
parent ef0464dba6 409ce34a0b
commit e4e75a4d64
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hgtags
+1
View File
@@ -8,3 +8,4 @@ a83e7a482e65befcfbb0e24af8cd5d15190acdd7 0.9.6-rc1
b8f67c6cd0d62f864db9b2b265b4e260ad7d873c 0.9.6-rc2
35918dd4b3771158b2b57410613ef029e08bbd60 0.9.6
5f25d1f97f9dde3e391a668c1c610a52a5db8244 0.9.6.1
ef31fc61ac48018c464f28ebfdf865b96bf83f18 0.9.6.2
ChangeLog
+6
View File
@@ -1,5 +1,11 @@
*** september 2010 ***
* 0.9.6.2 [20100915]
- fix a regression in virtual hosting mode
- fix pythonpath usage in --ini and --ini-paste
- new uwsgi packet var: UWSGI_CHDIR
* 0.9.6.1 [20100912]
- print the request uri during SIGPIPE or HARAKIRI
plugins/lua/lua_plugin.c
+4 -4
View File
@@ -144,7 +144,7 @@ int uwsgi_request(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
perror("write()");
return -1 ;
}
if (write(wsgi_req->poll.fd, http, slen) != slen) {
if (write(wsgi_req->poll.fd, http, slen) != (ssize_t) slen) {
perror("write()");
return -1 ;
}
@@ -159,7 +159,7 @@ int uwsgi_request(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
lua_pushnil(ulua.L);
while(lua_next(ulua.L, -3) != 0) {
http = lua_tolstring(ulua.L, -2, &slen);
if (write(wsgi_req->poll.fd, http, slen) != slen) {
if (write(wsgi_req->poll.fd, http, slen) != (ssize_t) slen) {
perror("write()");
return -1 ;
}
@@ -168,7 +168,7 @@ int uwsgi_request(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
return -1 ;
}
http = lua_tolstring(ulua.L, -1, &slen);
if (write(wsgi_req->poll.fd, http, slen) != slen) {
if (write(wsgi_req->poll.fd, http, slen) != (ssize_t) slen) {
perror("write()");
return -1 ;
}
@@ -190,7 +190,7 @@ int uwsgi_request(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
while ( (i = lua_pcall(ulua.L, 0, 1, 0)) == 0) {
if (lua_type(ulua.L, -1) == LUA_TSTRING) {
http = lua_tolstring(ulua.L, -1, &slen);
if (write(wsgi_req->poll.fd, http, slen) != slen) {
if (write(wsgi_req->poll.fd, http, slen) != (ssize_t) slen) {
perror("write()");
return -1 ;
}
plugins/psgi/psgi_plugin.c
+2 -2
View File
@@ -124,7 +124,7 @@ int uwsgi_init(struct uwsgi_server *uwsgi, char *args){
goto clear;
}
psgibuffer = malloc(stat_psgi.st_size);
psgibuffer = malloc(stat_psgi.st_size + 1);
if (!psgibuffer) {
uwsgi_error("malloc()");
close(fd);
@@ -321,7 +321,7 @@ int uwsgi_request(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
wsgi_req->hvec[vi].iov_base = "\r\n" ; wsgi_req->hvec[vi].iov_len = 2 ;
if ( (wsgi_req->response_size = writev(wsgi_req->poll.fd, wsgi_req->hvec, vi+1)) < 0) {
if ( !(wsgi_req->response_size = writev(wsgi_req->poll.fd, wsgi_req->hvec, vi+1)) ) {
uwsgi_error("writev()");
}