diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2015-07-21 16:42:31 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2015-07-21 16:46:35 +0200 |
| commit | 65caca67217cc7c22c38f678b7b196da194a6e4e (patch) | |
| tree | e7c4fdf63b62c331f84c07ef54abbd6cb55a19b1 /main/lua-turbo | |
| parent | 57596af29b87e0affd224cf56dd635f205e71f76 (diff) | |
| download | aports-65caca67217cc7c22c38f678b7b196da194a6e4e.tar.bz2 aports-65caca67217cc7c22c38f678b7b196da194a6e4e.tar.xz | |
main/lua-turbo: upgrade to 1.1.5 and case sensitive url matching
https://github.com/kernelsauce/turbo/issues/142
Diffstat (limited to 'main/lua-turbo')
| -rw-r--r-- | main/lua-turbo/APKBUILD | 22 | ||||
| -rw-r--r-- | main/lua-turbo/case-sensitive-url-matching.patch | 37 |
2 files changed, 50 insertions, 9 deletions
diff --git a/main/lua-turbo/APKBUILD b/main/lua-turbo/APKBUILD index a75efaec24..9ba1753fcd 100644 --- a/main/lua-turbo/APKBUILD +++ b/main/lua-turbo/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> -# Maintainer: +# Maintainer: Carlo Landmeter <clandmeter@gmail.com> _jitver=$(grep "^pkgver=" ../luajit/APKBUILD) pkgname=lua-turbo -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=0 pkgdesc="a framework built for LuaJIT 2 and Linux" url="http://www.turbolua.org/" @@ -16,7 +16,8 @@ makedepends="$depends_dev openssl-dev" install="" subpackages="" source="$pkgname-$pkgver.tar.gz::https://github.com/kernelsauce/turbo/archive/v$pkgver.tar.gz - fix-bindir.patch" + fix-bindir.patch + case-sensitive-url-matching.patch" _builddir="$srcdir/turbo-$pkgver" @@ -42,9 +43,12 @@ package() { LUAJIT_VERSION=${_jitver#*=} install || return 1 } -md5sums="a1216163e5427881116c567f4db94ae5 lua-turbo-1.1.4.tar.gz -5fbc1fcf73ef48998a90b06df782162c fix-bindir.patch" -sha256sums="c43ca74853bdaa65434f91e7f0d05bf0d45dcd5c459e30e9eac362fefdd9a377 lua-turbo-1.1.4.tar.gz -d676d0cd520759f293afdb59e59024a4ad30a8c419ab348e6acc1e72a1bb90a4 fix-bindir.patch" -sha512sums="599739e376918400dbb740a119b26f53b56e7631cfb3670d2b607026dd64fd23b25d16a4fb4c67bc7824bc275f217c71dfb1fbe3f5186bce316c05b83883d0b6 lua-turbo-1.1.4.tar.gz -e8ce4427bcf7040fdf3f711a533a0857d9dcf3678334fd4b32917642cb1a5c540ade3d3c8e26bc6b8a7ce0ff6c6f64c92eda70edec3874e7aa3507acb82c2211 fix-bindir.patch" +md5sums="b626b227bb2a47f59dda68d121b47db6 lua-turbo-1.1.5.tar.gz +5fbc1fcf73ef48998a90b06df782162c fix-bindir.patch +87944005b334730fe2536cd2897c3fba case-sensitive-url-matching.patch" +sha256sums="bfad7e1e229d2fd95c571b99d645032cd5b8799bd533c310fcadabc7ae181214 lua-turbo-1.1.5.tar.gz +d676d0cd520759f293afdb59e59024a4ad30a8c419ab348e6acc1e72a1bb90a4 fix-bindir.patch +de865aa2c1a0c32088f7eac03521ca71d79a5ea89adedac8cecd99ee5fe67a7e case-sensitive-url-matching.patch" +sha512sums="86b64b4a65743cc8033611a9500ce59521af936a460a34d8ca94d18caf311c6213c5448d501829399201e1a930f10a707cffd27b4736a220227606fbba9d38ac lua-turbo-1.1.5.tar.gz +e8ce4427bcf7040fdf3f711a533a0857d9dcf3678334fd4b32917642cb1a5c540ade3d3c8e26bc6b8a7ce0ff6c6f64c92eda70edec3874e7aa3507acb82c2211 fix-bindir.patch +b6154799a70c59b7bddffc1afa296afe1e3ac3c3c6bcdd29a4bfbac61bba1f9f12500ed5d9ee326788033213e749adfb63c1c03625b3c3f0081079a76ab3c9eb case-sensitive-url-matching.patch" diff --git a/main/lua-turbo/case-sensitive-url-matching.patch b/main/lua-turbo/case-sensitive-url-matching.patch new file mode 100644 index 0000000000..4de2a17c9b --- /dev/null +++ b/main/lua-turbo/case-sensitive-url-matching.patch @@ -0,0 +1,37 @@ +From 525910f1caaa12669d51b86c9f154586ff1c1815 Mon Sep 17 00:00:00 2001 +From: John Abrahamsen <jhnabrhmsn@gmail.com> +Date: Fri, 24 Apr 2015 18:19:53 +0200 +Subject: [PATCH] Case sensitive URL matching as requested in issue #142. + +--- + turbo/web.lua | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/turbo/web.lua b/turbo/web.lua +index 80cc40a..01224da 100644 +--- a/turbo/web.lua ++++ b/turbo/web.lua +@@ -730,7 +730,13 @@ function web.RequestHandler:_execute() + end + self:prepare() + if not self._finished then +- self[self.request.method:lower()](self, unpack(self._url_args)) ++ -- If there is no URL args then do not unpack as this has a significant ++ -- cost. ++ if self._url_args and #self._url_args > 0 then ++ self[self.request.method:lower()](self, unpack(self._url_args)) ++ else ++ self[self.request.method:lower()](self) ++ end + if self._auto_finish and not self._finished then + self:finish() + end +@@ -1157,7 +1163,7 @@ end + -- class. + -- @param request (HTTPRequest instance) + function web.Application:_get_request_handlers(request) +- local path = request.path and request.path:lower() ++ local path = request.path + if not path then + path = "/" + end |