diff --git a/.hgtags b/.hgtags index 06566b0b..adfa0d1f 100644 --- a/.hgtags +++ b/.hgtags @@ -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 diff --git a/ChangeLog b/ChangeLog index d2b7cbda..be0daf29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/plugins/lua/lua_plugin.c b/plugins/lua/lua_plugin.c index 61a3a70e..b2e64911 100644 --- a/plugins/lua/lua_plugin.c +++ b/plugins/lua/lua_plugin.c @@ -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 ; } diff --git a/plugins/psgi/psgi_plugin.c b/plugins/psgi/psgi_plugin.c index 2ec9f016..8c448eab 100644 --- a/plugins/psgi/psgi_plugin.c +++ b/plugins/psgi/psgi_plugin.c @@ -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()"); } diff --git a/setup.py b/setup.py index 7d0fca98..12f374c4 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ class uWSGIDistribution(Distribution): setup(name='uWSGI', - version='0.9.6.1', + version='0.9.6.2', description='The uWSGI server', author='Unbit', author_email='info@unbit.it', diff --git a/uwsgi.h b/uwsgi.h index 91f8e4e6..0db58453 100644 --- a/uwsgi.h +++ b/uwsgi.h @@ -2,7 +2,7 @@ /* indent -i8 -br -brs -brf -l0 -npsl -nip -npcs -npsl -di1 */ -#define UWSGI_VERSION "0.9.6.1" +#define UWSGI_VERSION "0.9.6.2" #define uwsgi_error(x) uwsgi_log("%s: %s [%s line %d]\n", x, strerror(errno), __FILE__, __LINE__); #define uwsgi_debug(x, ...) uwsgi_log("[uWSGI DEBUG] " x, __VA_ARGS__);