diff options
| -rw-r--r-- | www/py-uwsgi/distinfo | 6 | ||||
| -rw-r--r-- | www/py-uwsgi/patches/patch-plugins_cgi_cgi__plugin.c | 18 | ||||
| -rw-r--r-- | www/py-uwsgi/patches/patch-plugins_gccgo_gccgo__plugin.c | 15 | ||||
| -rw-r--r-- | www/py-uwsgi/patches/patch-plugins_jwsgi_jwsgi__plugin.c | 19 | ||||
| -rw-r--r-- | www/py-uwsgi/patches/patch-plugins_lua_lua__plugin.c | 19 |
5 files changed, 76 insertions, 1 deletions
diff --git a/www/py-uwsgi/distinfo b/www/py-uwsgi/distinfo index 9e25f0b678e..3924bb8fbcf 100644 --- a/www/py-uwsgi/distinfo +++ b/www/py-uwsgi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2015/11/04 02:47:31 agc Exp $ +$NetBSD: distinfo,v 1.27 2016/01/11 22:57:00 joerg Exp $ SHA1 (uwsgi-2.0.10.tar.gz) = 31bae2dac113af8d95dbc9b982df139ff61ce209 RMD160 (uwsgi-2.0.10.tar.gz) = 24d9f7528ed3d5f20b962a60512ab9ab1a43ef35 @@ -6,5 +6,9 @@ SHA512 (uwsgi-2.0.10.tar.gz) = 027f2ad94f5213f5de13c08670a5f084b7d4e5aa1670550fd Size (uwsgi-2.0.10.tar.gz) = 779820 bytes SHA1 (patch-base.ini) = 1c5d7693e6c8011e6cc34f5f5d203584c985eb30 SHA1 (patch-core_logging.c) = bce3b6fe0e54d25ad631671363b0872f9084e0f2 +SHA1 (patch-plugins_cgi_cgi__plugin.c) = f163383c837069b046d2677c8b6dc71501c5defa +SHA1 (patch-plugins_gccgo_gccgo__plugin.c) = 5e26ef0bbcee33234444552bb160f8c5862104ce +SHA1 (patch-plugins_jwsgi_jwsgi__plugin.c) = 9feaa75262e86b96f28fd46f097da05e7ee7ee0a +SHA1 (patch-plugins_lua_lua__plugin.c) = 2e94763765176256663f6d440d157221a71889d6 SHA1 (patch-uwsgi.h) = 64b5f6ea310bf6c65c1f546e160fcd0bd94a3808 SHA1 (patch-uwsgiconfig.py) = aab47457f2fafb0206a53913ef3777700175d020 diff --git a/www/py-uwsgi/patches/patch-plugins_cgi_cgi__plugin.c b/www/py-uwsgi/patches/patch-plugins_cgi_cgi__plugin.c new file mode 100644 index 00000000000..bf31cae9fc1 --- /dev/null +++ b/www/py-uwsgi/patches/patch-plugins_cgi_cgi__plugin.c @@ -0,0 +1,18 @@ +$NetBSD: patch-plugins_cgi_cgi__plugin.c,v 1.1 2016/01/11 22:57:00 joerg Exp $ + +--- plugins/cgi/cgi_plugin.c.orig 2016-01-11 16:11:06.000000000 +0000 ++++ plugins/cgi/cgi_plugin.c +@@ -763,12 +763,11 @@ clear2: + } + + // fill cgi env +- for(i=0;i<wsgi_req->var_cnt;i++) { ++ for(i=0;i<wsgi_req->var_cnt;i+=2) { + // no need to free the putenv() memory + if (putenv(uwsgi_concat3n(wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, "=", 1, wsgi_req->hvec[i+1].iov_base, wsgi_req->hvec[i+1].iov_len))) { + uwsgi_error("putenv()"); + } +- i++; + } + + diff --git a/www/py-uwsgi/patches/patch-plugins_gccgo_gccgo__plugin.c b/www/py-uwsgi/patches/patch-plugins_gccgo_gccgo__plugin.c new file mode 100644 index 00000000000..7fca8522a29 --- /dev/null +++ b/www/py-uwsgi/patches/patch-plugins_gccgo_gccgo__plugin.c @@ -0,0 +1,15 @@ +$NetBSD: patch-plugins_gccgo_gccgo__plugin.c,v 1.1 2016/01/11 22:57:00 joerg Exp $ + +--- plugins/gccgo/gccgo_plugin.c.orig 2016-01-11 16:11:52.000000000 +0000 ++++ plugins/gccgo/gccgo_plugin.c +@@ -233,9 +233,8 @@ static int uwsgi_gccgo_request(struct ws + + wsgi_req->async_environ = uwsgigo_env(wsgi_req); + int i; +- for(i=0;i<wsgi_req->var_cnt;i++) { ++ for(i=0;i<wsgi_req->var_cnt;i+=2) { + uwsgigo_env_add(wsgi_req->async_environ, wsgi_req->hvec[i].iov_base, wsgi_req->hvec[i].iov_len, wsgi_req->hvec[i+1].iov_base, wsgi_req->hvec[i+1].iov_len); +- i++; + } + uwsgigo_request(wsgi_req->async_environ, wsgi_req); + end: diff --git a/www/py-uwsgi/patches/patch-plugins_jwsgi_jwsgi__plugin.c b/www/py-uwsgi/patches/patch-plugins_jwsgi_jwsgi__plugin.c new file mode 100644 index 00000000000..10867a06fdb --- /dev/null +++ b/www/py-uwsgi/patches/patch-plugins_jwsgi_jwsgi__plugin.c @@ -0,0 +1,19 @@ +$NetBSD: patch-plugins_jwsgi_jwsgi__plugin.c,v 1.1 2016/01/11 22:57:00 joerg Exp $ + +--- plugins/jwsgi/jwsgi_plugin.c.orig 2016-01-11 16:11:52.000000000 +0000 ++++ plugins/jwsgi/jwsgi_plugin.c +@@ -71,13 +71,12 @@ static int uwsgi_jwsgi_request(struct ws + if (!hm) return -1; + + int i; +- for(i=0;i<wsgi_req->var_cnt;i++) { ++ for(i=0;i<wsgi_req->var_cnt;i+=) { + char *hk = wsgi_req->hvec[i].iov_base; + uint16_t hk_l = wsgi_req->hvec[i].iov_len; + char *hv = wsgi_req->hvec[i+1].iov_base; + uint16_t hv_l = wsgi_req->hvec[i+1].iov_len; + if (uwsgi_jwsgi_add_request_item(hm, hk, hk_l, hv, hv_l)) goto end; +- i++; + } + + if (uwsgi_jwsgi_add_request_input(hm, "jwsgi.input", 11)) goto end; diff --git a/www/py-uwsgi/patches/patch-plugins_lua_lua__plugin.c b/www/py-uwsgi/patches/patch-plugins_lua_lua__plugin.c new file mode 100644 index 00000000000..d497b0e4530 --- /dev/null +++ b/www/py-uwsgi/patches/patch-plugins_lua_lua__plugin.c @@ -0,0 +1,19 @@ +$NetBSD: patch-plugins_lua_lua__plugin.c,v 1.1 2016/01/11 22:57:00 joerg Exp $ + +--- plugins/lua/lua_plugin.c.orig 2016-01-11 16:11:52.000000000 +0000 ++++ plugins/lua/lua_plugin.c +@@ -764,13 +764,12 @@ static int uwsgi_lua_request(struct wsgi + lua_newtable(L); + lua_pushstring(L, ""); + lua_setfield(L, -2, "CONTENT_TYPE"); +- for(i=0;i<wsgi_req->var_cnt;i++) { ++ for(i=0;i<wsgi_req->var_cnt;i+=2) { + lua_pushlstring(L, (char *)wsgi_req->hvec[i+1].iov_base, wsgi_req->hvec[i+1].iov_len); + // transform it in a valid c string TODO this is ugly + ptrbuf = wsgi_req->hvec[i].iov_base+wsgi_req->hvec[i].iov_len; + *ptrbuf = 0; + lua_setfield(L, -2, (char *)wsgi_req->hvec[i].iov_base); +- i++; + } + + |