ready for rc

plugins/fastrouter/fastrouter.c

@@ -216,7 +216,9 @@ struct fastrouter_session {
 	uint16_t hostname_len;
 
 	int has_key;
+#ifdef UWSGI_SCTP
 	int persistent;
+#endif
 
 	char *instance_address;
 	uint64_t instance_address_len;
@@ -252,10 +254,14 @@ static void close_session(struct fastrouter_session *fr_session) {
 
 
 	if (fr_session->instance_fd != -1) {
+#ifdef UWSGI_SCTP
 		if (!ufr.fr_table[fr_session->instance_fd]->persistent) {
+#endif
 			close(fr_session->instance_fd);
 			ufr.fr_table[fr_session->instance_fd] = NULL;
+#ifdef UWSGI_SCTP
 		}
+#endif
 	}
 
 	if (fr_session->instance_failed) {
@@ -685,9 +691,13 @@ void fastrouter_loop(int id) {
 					continue;
 				}
 
+#ifdef UWSGI_SCTP
 				if (!fr_session->persistent) {
+#endif
 					fr_session->timeout = reset_timeout(fr_session);
+#ifdef UWSGI_SCTP
 				}
+#endif
 
 				switch (fr_session->status) {
 

uwsgiconfig.py

@@ -946,7 +946,7 @@ if __name__ == "__main__":
     elif cmd == '--unbit':
         build_uwsgi(uConf('buildconf/unbit.ini'))
     elif cmd == '--plugin':
-        bconf = 'default.ini'
+        bconf = os.environ.get('UWSGI_PROFILE','default.ini')
         try:
             bconf = sys.argv[3]
             if not bconf.endswith('.ini'):

welcome.py

@@ -44,7 +44,7 @@ def serve_logo(e, sr):
 
 def serve_options(e, sr):
     sr('200 OK', [('Content-Type', 'text/html')])
-    for opt in xrange(0,256):
+    for opt in range(0,256):
         yield "<b>%d</b> = %d<br/>" % (opt, uwsgi.get_option(opt))
 
 def serve_config(e, sr):
@@ -109,7 +109,7 @@ def application(env, start_response):
 </tr>
         """ % (w['id'], w['pid'], w['status'], w['running_time']/1000, w['avg_rt']/1000, w['tx'], apps)
 
-    return """
+    output = """
 <img src="/logo"/> version %s running on %s (remote user: %s)<br/>
 <hr size="1"/>
 
@@ -132,6 +132,8 @@ Workers and applications<br/>
 
     """ % (uwsgi.version, uwsgi.hostname, env.get('REMOTE_USER','None'), workers)
 
+    #return bytes(output.encode('latin1'))
+    return output