a bunch of fixes for release candidate

unbit · Apr 14, 2010 · 174116c · 174116c
1 parent 4be5830
commit 174116c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/plugins/lua/lua_plugin.c b/plugins/lua/lua_plugin.c
@@ -208,5 +208,7 @@ int uwsgi_request(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
 }
 
 void uwsgi_after_request(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
-	return;
+
+	if (uwsgi->shared->options[UWSGI_OPTION_LOGGING])
+                log_request(wsgi_req);
 }
diff --git a/uwsgi.c b/uwsgi.c
@@ -1376,12 +1376,14 @@ int main(int argc, char *argv[], char *envp[]) {
 
 
 	// postpone the queue initialization as kevent do not pass kfd after fork()
+#ifdef UWSGI_ASYNC
 	if (uwsgi.async > 1) {
 		uwsgi.async_queue = async_queue_init(uwsgi.serverfd);
 		if (uwsgi.async_queue < 0) {
 			exit(1);
 		}
 	}
+#endif
 
 
 

diff --git a/uwsgiconfig.py b/uwsgiconfig.py
@@ -23,7 +23,8 @@
 GCC='gcc'
 
 # specific compilation flags
-XML_IMPLEMENTATION = 'expat'
+# libxml2 or expat
+XML_IMPLEMENTATION = 'libxml2'
 # if you want to use alternative python lib, specifiy its path here
 #PYLIB_PATH = '/home/roberto/uwsgi/STACKLESS/slp/lib'
 PYLIB_PATH = ''