prepare for uWSGI 1.9.1

buildconf/unbit.ini

@@ -1,26 +1,25 @@
 [uwsgi]
-xml = auto
-ini = true
+xml = true
 yaml = true
-json = auto
-sqlite3 = auto
-zeromq = auto
-ssl = auto
-ldap = auto
-pcre = auto
-routing = auto
+json = false
+sqlite3 = false
+zeromq = false
+ssl = true
+ldap = false
+pcre = true
+routing = true
 debug = false
-unbit = false
-xml_implementation = libxml2
+unbit = true
+xml_implementation = expat
 yaml_implementation = auto
 malloc_implementation = libc
 extras =
 plugins =
-bin_name = uwsgi
-append_version =
-plugin_dir = .
-embedded_plugins = %(main_plugin)s, ping, cache, nagios, rrdtool, carbon, rpc, corerouter, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter, router_static, sslrouter
-as_shared_library = false
+bin_name = /opt/unbit/uwsgi19/lib/libuwsgi.so
+append_version = unbit
+plugin_dir = /opt/unbit/uwsgi19/plugins
+embedded_plugins =
+as_shared_library = true
 
 locking = auto
 event = auto

core/routing.c

@@ -648,13 +648,21 @@ static int uwsgi_route_condition_regexp(struct wsgi_request *wsgi_req, struct uw
 	if (uwsgi_regexp_match(pattern, pattern_extra, ub->buf, ub->pos) >= 0) {
 		uwsgi_buffer_destroy(ub);
 		pcre_free(pattern);
+#ifdef PCRE_STUDY_JIT_COMPILE
 		pcre_free_study(pattern_extra);
+#else
+		pcre_free(pattern_extra);
+#endif
 		return 1;
 	}
 
         uwsgi_buffer_destroy(ub);
 	pcre_free(pattern);
+#ifdef PCRE_STUDY_JIT_COMPILE
 	pcre_free_study(pattern_extra);
+#else
+	pcre_free(pattern_extra);
+#endif
         return 0;
 }
 

plugins/xslt/xslt.c

@@ -49,7 +49,7 @@ struct uwsgi_option uwsgi_xslt_options[] = {
 static char *uwsgi_xslt_apply(char *xmlfile, char *xsltfile, char *params, int *rlen) {
 
 	char **vparams = NULL;
-	char *tmp_params;
+	char *tmp_params = NULL;
 	uint16_t count = 0;
 	if (params) {
 		// first count the number of items

uwsgiconfig.py

@@ -1,6 +1,6 @@
 # uWSGI build system
 
-uwsgi_version = '1.9'
+uwsgi_version = '1.9.1'
 
 import os
 import re