Commit Graph

224 Commits

Author SHA1 Message Date
Izorkin
619aa5c97f nginxMainline: 1.15.12 -> 1.16.0 2019-04-30 07:56:29 +03:00
Izorkin
65a736064a nginxStable: 1.14.2 -> 1.16.0 2019-04-30 07:56:23 +03:00
Yurii Izorkin
5ba8811758 nginxMainline: 1.15.10 -> 1.15.12 (#59950) 2019-04-22 00:08:08 +02:00
aszlig
1f24685d93
nginx/etag-patch: Use Nix store dir from build env
So far, the Nix store directory was hardcoded and if someone uses a
different Nix store directory the patch won't work. Of course, this is
pretty uncommon, but by not only substituting the store directory but
also the length of it we also save a few calls to ngx_strlen(), which
should save us a few cycles.

Signed-off-by: aszlig <aszlig@nix.build>
2019-04-18 10:07:55 +02:00
aszlig
af5a3ce474
nginx: Fix memleak in nix-etag patch
The original patch introduced a new "real" variable which gets populated
(and allocated) via ngx_realpath(). It's properly freed in error
conditions but it won't be freed if ngx_http_set_etag returns
successfully.

Adding another ngx_free() just before returning fixes that memory leak.

I also fixed a small indentation issue along the way.

Signed-off-by: aszlig <aszlig@nix.build>
2019-04-18 09:40:13 +02:00
Yegor Timoshenko
1da8eec00f
nginx: handle impure symlinks in ETag patch 2019-04-18 09:40:11 +02:00
Yegor Timoshenko
f03302b636
nginx: check for realpath() == NULL in ETag patch
Thanks to Gabriel Ebner!
2019-04-18 09:40:09 +02:00
Yegor Timoshenko
135d54f535
nginx: if root is in Nix store, use path's hash as ETag
Resolves #25485. Usage example:

$ realpath /var/www
/nix/store/wnrhnnpdj3x50j5xz38zp1qxs1ygwccw-site
$ curl --head localhost
HTTP/1.1 200 OK
Server: nginx
Date: Fri, 28 Sep 2018 06:09:25 GMT
Content-Type: text/html
Content-Length: 50
Last-Modified: Thu, 01 Jan 1970 00:00:01 GMT
Connection: keep-alive
ETag: "wnrhnnpdj3x50j5xz38zp1qxs1ygwccw"
Accept-Ranges: bytes
2019-04-18 09:40:06 +02:00
Franz Pletz
4c0d1ae7be
nginxMainline: 1.15.9 -> 1.15.10 2019-04-02 12:02:39 +02:00
Maximilian Bosch
37867dba74
nginxModules.http_proxy_connect_module: init
This adds the nginx module `ngx_http_proxy_connect_module` which allows
to tunnel HTTPS through an nginx proxy[1].

As this module contained patches for several nginx version, some minor
adjustments were needed:

* Allowed each entry in `nginxModules` to provide patches.

* Added an optional `supports` attribute to ensure that each module can
  determine if it supports the currently built nginx version (e.g. stable
  1.14 ATM or mainline 1.15 ATM).

[1] https://github.com/chobits/ngx_http_proxy_connect_module
2019-03-29 23:53:09 +01:00
Benjamin Smith
f4d24273e5 nginx: add http subs filter module (#56546) 2019-03-13 02:16:40 +02:00
Alyssa Ross
2576d09716 nginxMainline: 1.15.8 -> 1.15.9 (#56416) 2019-02-28 22:13:35 +01:00
Vincent Bernat
33802e9ed8 nginx: expose list of additional modules (#53897)
Currently, it seems there is no easy way to override package to add
modules. For example, if we want to add the `ipscrub` module, we can
do:

    pkgs.nginxStable.override {
      modules = [ pkgs.nginxModules.ipscrub ];
    };

But, then, we loose `rtmp`, `dav` and `moreheaders` which are defined
in `all-packages.nix`. With this modification, we can now do:

    pkgs.nginxStable.override {
      modules = pkg.nginxStable.passthru.modules ++ [ pkgs.nginxModules.ipscrub ];
    };
2019-01-31 02:15:14 +02:00
Franz Pletz
9ea5b2c052
nginxMainline: 1.15.7 -> 1.15.8 2019-01-11 07:55:25 +01:00
Jörg Thalheim
8871ffccff nginx: fix cross-build 2018-12-11 18:13:21 +01:00
Alyssa Ross
703827f36c nginx: 1.14.1 -> 1.14.2 2018-12-05 10:56:06 -06:00
Alyssa Ross
dcae76862b nginxMainline: 1.15.6 -> 1.15.7 2018-11-27 21:28:49 +00:00
Alyssa Ross
de9026de6e
nginxMainline: 1.15.5 -> 1.15.6
CVE-2018-16843, CVE-2018-16844

https://nginx.org/en/security_advisories.html
2018-11-15 17:52:05 +00:00
Alyssa Ross
1908322d10
nginxStable: 1.14.0 -> 1.14.1
CVE-2018-16843, CVE-2018-16844

https://nginx.org/en/security_advisories.html
2018-11-15 17:51:51 +00:00
Daiderd Jordan
6d71316410
nginx: init ngx_aws_auth at 2.1.1 2018-11-08 20:02:44 +01:00
Rob Vermaas
75167083e5 nginx-opentracing: init at 0.7.0
(cherry picked from commit 9d6184f1bc)
2018-10-23 18:08:01 +02:00
Thilo Uttendorfer
205b3d94e1 nginxMainline: 1.15.3 -> 1.15.5 (#48127) 2018-10-10 00:18:54 +02:00
Franz Pletz
647b5b1a29
nginxMainline: 1.15.2 -> 1.15.3 2018-08-31 14:42:14 +02:00
xeji
176891c0ad
Merge pull request #44467 from Izorkin/nginx-modules
Nginx modules
2018-08-05 22:20:05 +02:00
Johannes Frankenau
c481117673 nginxMainline: 1.15.1 -> 1.15.2 (#44431) 2018-08-04 21:06:35 +02:00
Izorkin
e0de8354b9 nginxModules.lua-upstream: init at v0.07 2018-08-04 20:54:36 +03:00
Izorkin
29b3e11541 nginxModules.url: init at rev 9299816 2018-08-04 20:54:36 +03:00
Izorkin
a5674cebb9 nginxModules.sysguard: init at rev e512897 2018-08-04 20:54:35 +03:00
Izorkin
9100091f3f nginxModules.stream-sts: init at v0.1.1 2018-08-04 20:54:35 +03:00
Izorkin
9958868dfd nginxModules.sts: init at v0.1.1 2018-08-04 20:54:35 +03:00
Izorkin
07e7966d3b nginxModules.upstream-tarantool: init at v2.7 2018-07-29 14:54:55 +03:00
Izorkin
ca37481d25 nginxModules.push-stream: init at v0.5.4 2018-07-29 14:54:47 +03:00
Izorkin
aa68f56c0a nginxModules.vts: init at v0.1.18 2018-07-29 14:54:08 +03:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Izorkin
e76f382c75 nginxModules: sorting of modules alphabetically 2018-07-16 03:44:32 +00:00
Franz Pletz
0a5186a7cb
Merge pull request #43580 from Izorkin/nginx-modules
Update nginx modules
2018-07-15 21:56:09 +00:00
Izorkin
3a5d104a33 nginxModules.develkit: update to v0.3.1rc1 2018-07-16 00:25:36 +03:00
Izorkin
75b2940145 nginxModules.upstream-check: update to rev 9aecf15 2018-07-16 00:25:20 +03:00
Izorkin
c96d49733a nginxModules.statsd: update to rev b970e40 2018-07-16 00:25:01 +03:00
Izorkin
04eb0731fb nginxModules.pam: update to v1.5.1 2018-07-16 00:24:45 +03:00
Izorkin
eff0def7dc nginxModules.set-misc: update to v0.32 2018-07-16 00:24:27 +03:00
Izorkin
ea52907348 nginxModules.lua: update to v0.10.13 2018-07-16 00:24:14 +03:00
Izorkin
8584845aa1 nginxModules.moreheaders: update to v0.33 2018-07-16 00:23:41 +03:00
Izorkin
a16eee878f nginxModules.ipscrub: update to v1.0.1 2018-07-16 00:22:54 +03:00
Izorkin
11653f8e6b nginxModules.sla: init at 7778f01 2018-07-15 20:29:57 +00:00
Franz Pletz
3239ef84ea
nginxMainline: 1.13.12 -> 1.15.1 2018-07-15 21:41:45 +02:00
Izorkin
bfb393f55e nginx-fancyindex: init at 0.4.3 2018-07-15 20:07:34 +03:00
Matthew Bauer
af56538c89
Merge pull request #42687 from nh2/nginx-debug-build
nginx: Flag to build with debugging and parallel builds
2018-07-05 22:11:51 -04:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Niklas Hambüchen
c834fb39c3 nginx: Enable parallel building 2018-06-28 01:35:41 +02:00