3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1107 commits

Author SHA1 Message Date
Emily 6d046e1079 openresty: rebase on top of nginx package
The primary motivation of this change was to allow third-party modules
to be used with OpenResty, but it also results in a significant
reduction of code duplication.
2020-02-04 19:30:40 -06:00
Emily db3182a65d nginxModules.brotli: v0.1.2 -> unstable
The fork was merged back upstream but has yet to see a formal release.
2020-02-04 19:30:40 -06:00
Will Dietz 500f032729
Merge pull request #78185 from dtzWill/update/nginx-1.17.8
nginxMainline: 1.17.3 -> 1.17.8
2020-02-03 17:35:42 -06:00
Aaron Andersen e23ba2a1b0 Revert "nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command"
This reverts commit 336a6f471f.
2020-02-02 08:08:02 -05:00
Maximilian Bosch 1bb18d9e8d
lwan: 0.2 -> 0.3, fix build w/glibc-2.30 2020-02-01 17:30:18 +01:00
Silvan Mosberger 80a2740991
Merge pull request #78265 from Synthetica9/https-homepages
treewide: fix redirected urls
2020-01-27 15:00:53 +01:00
Patrick Hilhorst 593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
R. RyanTM 359f235769 jetty: 9.4.24.v20191120 -> 9.4.25.v20191220 2020-01-21 16:06:08 -08:00
Will Dietz 92d29418b3
nginxMainline: 1.17.3 -> 1.17.8
http://nginx.org/en/CHANGES
2020-01-21 11:02:11 -06:00
Jörg Thalheim 71c19d3efa
Merge pull request #76537 from Izorkin/unit
unit: 1.13.0 -> 1.14.0
2020-01-21 11:39:41 +00:00
Leonhard Markert 8008905e5a lwan: 0.1 -> 0.2 2020-01-16 16:55:07 +00:00
Aaron Andersen 7260d2eb13
Merge pull request #77326 from aanderse/apacheHttpd
nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command
2020-01-15 21:02:05 -05:00
Mario Rodas c7e16e71d0
Merge pull request #77011 from r-ryantm/auto-update/mod_wsgi
mod_wsgi: 4.6.8 -> 4.7.0
2020-01-09 05:34:03 -05:00
Aaron Andersen 336a6f471f nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command 2020-01-08 10:37:46 -05:00
Aaron Andersen e9d3a3c7d8
Merge pull request #76417 from dirkx/redwax-modules
mod_ca, mod_crl, mod_csr, mod_ocsp, mod_scep, mod_pkcs12, mod_spkac, mod_timestamp: init at 0.2.1
2020-01-07 20:49:24 -05:00
R. RyanTM aa4fe9c768 mod_wsgi: 4.6.8 -> 4.7.0 2020-01-05 22:08:04 -08:00
Ryan Mulligan 6de8b8f144
Merge pull request #61722 from Izorkin/pinba-nginx
nginxModules.pinba: init at 13.05.2019
2020-01-04 07:58:18 -08:00
Frederik Rietdijk 7aa2b0215b Merge master into staging-next 2020-01-03 10:25:14 +01:00
aszlig 845e92835d
Merge Last-Modified fix for nginx (#76697)
This fixes the patch for nginx to clear the Last-Modified header if a
static file is served from the Nix store.

So far we only used the ETag from the store path, but if the
Last-Modified header is always set to "Thu, 01 Jan 1970 00:00:01 GMT",
Firefox and Chrome/Chromium seem to ignore the ETag and simply use the
cached content instead of revalidating.

Alongside the fix, this also adds a dedicated NixOS VM test, which uses
WebDriver and Firefox to check whether the content is actually served
from the browser's cache and to have a more real-world test case.
2020-01-02 21:41:59 +01:00
Frederik Rietdijk f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
zimbatm c187844214
unit: add withRuby_2_7 option 2020-01-01 00:25:03 +00:00
Robin Gloster 6ca6ac796b
treewide: configureFlags is a flat list 2019-12-31 01:37:49 +01:00
Robin Gloster 760e23136a
treewide: *inputs are lists 2019-12-31 01:09:25 +01:00
Robin Gloster 313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster 5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
aszlig ccf55bead1
nginx: Clear Last-Modified if ETag is from store
This is what I've suspected a while ago[1]:

> Heads-up everyone: After testing this in a few production instances,
> it seems that some browsers still get cache hits for new store paths
> (and changed contents) for some reason. I highly suspect that it might
> be due to the last-modified header (as mentioned in [2]).
>
> Going to test this with last-modified disabled for a little while and
> if this is the case I think we should improve that patch by disabling
> last-modified if serving from a store path.

Much earlier[2] when I reviewed the patch, I wrote this:

> Other than that, it looks good to me.
>
> However, I'm not sure what we should do with Last-Modified header.
> From RFC 2616, section 13.3.4:
>
> - If both an entity tag and a Last-Modified value have been
>   provided by the origin server, SHOULD use both validators in
>   cache-conditional requests. This allows both HTTP/1.0 and
>   HTTP/1.1 caches to respond appropriately.
>
> I'm a bit nervous about the SHOULD here, as user agents in the wild
> could possibly just use Last-Modified and use the cached content
> instead.

Unfortunately, I didn't pursue this any further back then because
@pbogdan noted[3] the following:

> Hmm, could they (assuming they are conforming):
>
>  * If an entity tag has been provided by the origin server, MUST
>    use that entity tag in any cache-conditional request (using If-
>    Match or If-None-Match).

Since running with this patch in some deployments, I found that both
Firefox and Chrome/Chromium do NOT re-validate against the ETag if the
Last-Modified header is still the same.

So I wrote a small NixOS VM test with Geckodriver to have a test case
which is closer to the real world and I indeed was able to reproduce
this.

Whether this is actually a bug in Chrome or Firefox is an entirely
different issue and even IF it is the fault of the browsers and it is
fixed at some point, we'd still need to handle this for older browser
versions.

Apart from clearing the header, I also recreated the patch by using a
plain "git diff" with a small description on top. This should make it
easier for future authors to work on that patch.

[1]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-495072764
[2]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-451644084
[3]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-451646135

Signed-off-by: aszlig <aszlig@nix.build>
2019-12-30 14:30:36 +01:00
Robin Gloster 2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Nathan b0caf68bff
maintainer-list.nix: remove ndowens 2019-12-26 16:47:41 -05:00
Izorkin b5bd159690 unit: add drop capabilites patch 2019-12-26 17:51:53 +03:00
Izorkin 681dca1b67 unit: 1.13.0 -> 1.14.0 2019-12-26 17:39:14 +03:00
Dirk-Willem van Gulik f85ec2d896 Additional redwax modules - including comments from review on #75620. 2019-12-24 17:01:04 +01:00
Jörg Thalheim b9bc38934b
h2o: build with openssl
otherwise we get symbol conflicts, once we link it against applications using
openssl
2019-12-21 22:55:58 +00:00
Izorkin edddf0ac47 nginxModules.pinba: init at 13.05.2019 2019-12-11 10:06:55 +03:00
Frederik Rietdijk f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00
Renaud f640cf49d1
rdf4store: remove pkg and service modules
(#74214)
2019-12-08 20:33:51 +01:00
Frederik Rietdijk 353ec3f3a8
Merge pull request #73491 from Izorkin/unit
unit: 1.12.0 -> 1.13.0
2019-12-05 10:25:54 +01:00
R. RyanTM fffce07e96 jetty: 9.4.22.v20191022 -> 9.4.24.v20191120 (#74417)
* jetty: 9.4.22.v20191022 -> 9.4.24.v20191120

* jetty: homepage over https
2019-11-30 22:03:40 +01:00
Jörg Thalheim 571ed9d22e
nginx: reference tests 2019-11-29 12:27:55 +00:00
tekeri a5f26644d4 Add nginx perl modules (#73198)
* nginx: enable perl_module if perl is given

* nginx: move `perl = null` to toplevel
2019-11-27 17:08:56 +00:00
Izorkin d5f8c4b1d1 unit: update build configuration 2019-11-24 12:55:21 +03:00
Izorkin 6ae0c68216 unit: 1.12.0 -> 1.13.0 2019-11-24 12:46:36 +03:00
R. RyanTM f28fad5e2f jetty: 9.4.16.v20190411 -> 9.4.22.v20191022
(#72533)
2019-11-06 19:30:58 +01:00
Aaron Andersen 0cad3f6734
Merge pull request #70365 from jglukasik/mod_tile
apacheHttpdPackages.mod_tile: init at unstable-2017-01-08
2019-11-05 20:45:55 -05:00
Joseph Lukasik babd3f7747 apacheHttpdPackage.mod_tile: init at unstable-2017-01-08 2019-11-01 22:52:14 -07:00
R. RyanTM 43e64eb545 mod_wsgi: 4.6.7 -> 4.6.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mod_wsgi/versions
2019-10-21 09:14:11 +02:00
Mario Rodas 86df0e335c tengine: 2.3.1 -> 2.3.2 (#70574)
* tengine: 2.3.1 -> 2.3.2

Changelog: https://github.com/alibaba/tengine/releases/tag/2.3.2

* tengine: unbreak
2019-10-15 22:00:09 +02:00
Renaud dbf21775d4
Merge pull request #70527 from Izorkin/nginx-unit
unit: 1.11.0 -> 1.12.0
2019-10-09 13:58:44 +02:00
Linus Heckemann 5aa4b19946 treewide: mark some broken packages as broken
Refs:
e675498026
1e9cc5b984
793a2fe1e8
c19cf65261
f6544d618f
2019-10-08 17:14:26 +02:00
Izorkin 1134fb45c0 unit: 1.11.0 -> 1.12.0 2019-10-06 15:33:03 +03:00
Ryan Mulligan 43be6a46a8
Merge pull request #69715 from r-ryantm/auto-update/openresty
openresty: 1.15.8.1 -> 1.15.8.2
2019-09-28 08:30:18 -07:00
R. RyanTM 8696c19bbb openresty: 1.15.8.1 -> 1.15.8.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openresty/versions
2019-09-27 16:17:19 -07:00
Vladimír Čunát eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Izorkin b397fbc0aa unit: 1.10.0 -> 1.11.0 2019-09-22 10:16:59 +03:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát 41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Austin Seipp 889537352b
h2o: 2.2.6 -> 2.3.0-beta2, enable multi-output
This also lets us remove a hack for supporting LibreSSL 2.7, since we're
now using 2.9 by default, anyway.

Finally, use Ninja to run the CMake build instead of Make -- speeds
things up for me by a few seconds.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-09-19 18:28:04 -05:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk 5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Alyssa Ross 5262dd23b3 unit: drop withRuby_2_3 option
Ruby 2.3 is EOL.
2019-09-07 13:09:17 +00:00
Franz Pletz de85797565
Merge remote-tracking branch 'origin/master' into gcc-8 2019-09-03 22:15:07 +02:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Peter Simons 79c6d22c1f mod_wsgi: allow building this module with python 2.x and 3.x 2019-08-27 14:27:31 +02:00
Robin Gloster 616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8 2019-08-25 18:55:46 +02:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Izorkin 9332861720 unit: 1.9.0 -> 1.10.0 2019-08-23 10:03:00 +03:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Marek Mahut f8892cb49c
Merge pull request #66890 from r-ryantm/auto-update/h2o
h2o: 2.2.5 -> 2.2.6
2019-08-19 11:51:02 +02:00
R. RyanTM 3ac9a51961 h2o: 2.2.5 -> 2.2.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/h2o/versions
2019-08-19 02:10:02 -07:00
Aaron Andersen 23abcd5ee3 apacheHttpd: 2.4.39 -> 2.4.41 2019-08-18 17:40:26 -04:00
Marek Mahut aff691af10
Merge pull request #65892 from r-ryantm/auto-update/couchdb
couchdb2: 2.3.0 -> 2.3.1
2019-08-18 16:28:41 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Izorkin 83381bec9c nginxMainline: 1.17.2 -> 1.17.3 2019-08-13 21:31:57 +03:00
Izorkin aec55db737 nginxStable: 1.16.0 -> 1.16.1 2019-08-13 21:30:08 +03:00
Marek Mahut 1b8da7d755 Adding python3Packages.requests as dependecy 2019-08-13 18:20:21 +02:00
Sander van der Burg 5f01a2586a
Merge pull request #50805 from r-ryantm/auto-update/axis2
axis2: 1.6.4 -> 1.7.9
2019-08-11 12:15:33 +02:00
Marek Mahut 0e679dd53e axis2: 1.7.8 -> 1.7.9 2019-08-10 10:24:53 +02:00
R. RyanTM 07a9c36ccf couchdb2: 2.3.0 -> 2.3.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/couchdb/versions
2019-08-03 17:34:19 -07:00
Jörg Thalheim 8044f32219
Merge pull request #61816 from Izorkin/nginxMainline
nginxMainline: 1.16.0 -> 1.17.2
2019-07-25 10:01:59 +01:00
Izorkin 293e5d8365 nginxMainline: 1.16.0 -> 1.17.2 2019-07-24 21:09:22 +03:00
Nick Novitski 7136e0d0a6 bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
Yorick van Pelt a9baaf90f6
couchdb2: pin to erlangR21 2019-07-16 10:35:47 +02:00
Elis Hirwing 80c7463a92
php: drop 7.1
PHP 7.1 is currently on life support, as in only recieving security related patches.

This will only continue until: 2019-12-01

This date are in the middle of the 19.09 lifecycle. So it would be
nice to not have it in the 19.09 stable release. Dropping it now would
also result in less maintanance in updating them.

The death dates can be seen on following links:
 - https://endoflife.date/php
 - https://php.net/supported-versions.php
 - https://en.wikipedia.org/wiki/PHP#Release_history
2019-07-04 14:31:49 +02:00
Rok Garbas 65781e204d
Remove me (garbas) as maintainer since I don't have much time to maintain anything 2019-07-03 11:27:39 +02:00
R. RyanTM 5e4bbd8bee tengine: 2.3.0 -> 2.3.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tengine/versions
2019-07-03 08:30:58 +02:00
R. RyanTM 3a28589551 mod_wsgi: 4.6.6 -> 4.6.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mod_wsgi/versions
2019-07-02 20:10:49 +02:00
Johan Thomsen 1fd9ac6ff6 tomcat85: 8.5.35 -> 8.5.42 2019-06-21 15:52:24 +02:00
Johan Thomsen e62883d5cf tomcat9: 9.0.13 -> 9.0.21 2019-06-21 15:40:02 +02:00
R. RyanTM 2779dd85e6 mod_wsgi: 4.6.5 -> 4.6.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mod_wsgi/versions
2019-06-17 15:30:45 +02:00
Franz Pletz c051374da2
nginx: fix build with gcc8 2019-06-17 07:06:02 +02:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
worldofpeace 132b013b9a
Merge pull request #62263 from Izorkin/nginx-unit
unit: 1.8.0 -> 1.9.0
2019-06-04 23:14:02 -04:00
R. RyanTM 7254994411 lighttpd: 1.4.53 -> 1.4.54
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lighttpd/versions
2019-06-02 10:21:14 +02:00
Izorkin aa8a11c1b3 unit: 1.8.0 -> 1.9.0 2019-05-30 22:57:45 +03:00
Izorkin c9156695cc tengine: 2.2.3 -> 2.3.0 2019-05-27 00:21:57 +03:00
markuskowa 4dda834ee3
Merge pull request #61870 from r-ryantm/auto-update/openresty
openresty: 1.13.6.2 -> 1.15.8.1
2019-05-22 13:51:09 +02:00
R. RyanTM 03d2c7f8a7 openresty: 1.13.6.2 -> 1.15.8.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openresty/versions
2019-05-22 02:17:37 -07:00
c0bw3b 582fd549fb winstone: drop package and service
Close #56294
Upstream package is unmaintained for years
and nixpkgs provides alternatives
2019-05-15 20:30:48 +02:00
Izorkin 872f056bb4 nginxModules.lua: 0.10.14 -> 0.10.15 2019-05-13 12:37:14 +03:00
Izorkin fa3f68edab nginxModules.http_proxy_connect_module: 16.04.2019 -> 06.05.2019 2019-05-13 12:37:10 +03:00
Jörg Thalheim 0816c69173
nginxModules: update and add nginx modules (#59949)
nginxModules: update and add nginx modules
2019-05-13 10:15:09 +01:00
Andrew Newman 0b5a5c52d6 lighttpd: fix crosscompilation 2019-05-08 10:43:00 +03:00
R. RyanTM 8d55d7f64f jetty: 9.4.14.v20181114 -> 9.4.16.v20190411
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jetty/versions
2019-05-01 11:10:54 +02:00
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
Izorkin 452cf0b3e2 nginxModules.naxsi: init at 0.56 2019-04-21 11:10:49 +03:00
Izorkin 6600d00ed1 nginxModules.video-thumbextractor: init at 0.9.0 2019-04-21 10:32:46 +03:00
Izorkin f6525448a5 nginxModules.sorted-querystring: init at 0.3 2019-04-21 10:30:29 +03:00
Izorkin b329187524 nginxModules.limit-speed: init at 21.05.2014 2019-04-21 10:27:31 +03:00
Izorkin 13c938ac1e nginxModules.subsFilter: 0.6.4 -> 13.04.2016 2019-04-21 10:21:44 +03:00
Izorkin d1dff5a9ec nginxModules.upstream-tarantool: 2.7 -> 2.7.1 2019-04-20 23:11:08 +03:00
Izorkin 6a154d00c3 nginxModules.upstream-check: 10.11.2017 -> 12.08.2018 2019-04-20 23:08:55 +03:00
Izorkin d66b94da62 nginxModules.coolkit: init at 0.2 2019-04-20 22:35:55 +03:00
Izorkin 80666e68b2 nginxModules.slowfs-cache: init at 1.10 2019-04-20 22:29:29 +03:00
Izorkin 8c1131ef28 nginxModules.lua: 0.10.13 -> 0.10.14 2019-04-20 22:29:29 +03:00
Izorkin 89a73423ab nginxModules.mpeg-ts: init at 0.1.1 2019-04-20 22:29:24 +03:00
Izorkin c940a7caa0 nginxModules.live: init at 18.11.2018 2019-04-20 21:46:45 +03:00
Izorkin b0dc2d6106 nginxModules.dav: 0.1.0 -> 3.0.0 2019-04-20 21:40:09 +03:00
Izorkin 7a5d938067 nginxModules.http_proxy_connect_module: 05.09.2018 -> 16.04.2019 2019-04-20 21:33:18 +03: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
Aaron Andersen 902ab43a91
Merge pull request #58125 from mwilsoninsight/showoff
showoff: init at 0.20.1
2019-04-08 20:14:06 -04:00
Franz Pletz 4c0d1ae7be
nginxMainline: 1.15.9 -> 1.15.10 2019-04-02 12:02:39 +02:00
Peter Simons 2017158b53 apache-httpd: 2.4.38 -> 2.4.39 (CVE-2019-0211)
In Apache HTTP Server 2.4 releases 2.4.17 to 2.4.38, with MPM event, worker or
prefork, code executing in less-privileged child processes or
threads (including scripts executed by an in-process scripting interpreter)
could execute arbitrary code with the privileges of the parent process (usually
root) by manipulating the scoreboard.
2019-04-02 09:46:25 +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
R. RyanTM d5e9e5fcf2 lighttpd: 1.4.52 -> 1.4.53
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lighttpd/versions
2019-03-26 06:37:24 +01:00
Max Wilson a2abe2aba1 adding showoff to pkgs/servers/http 2019-03-25 10:40:17 -04:00
Samuel Leathers cafd07a54e
Merge pull request #56423 from Izorkin/nginx-unit
unit: add service unit and update package
2019-03-20 13:08:05 -04:00
Izorkin 36bb87a7c3 unit: 1.7.1 -> 1.8.0 2019-03-16 19:55:00 +03:00
Izorkin 42a99b1be2 nixos/unit: init service unit 2019-03-16 19:54:21 +03:00
R. RyanTM db8198909f hiawatha: 10.8.3 -> 10.9 (#56695)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hiawatha/versions
2019-03-15 17:05:20 +01:00
Benjamin Smith f4d24273e5 nginx: add http subs filter module (#56546) 2019-03-13 02:16:40 +02:00
Peter Simons 0356c1b87d mod_fastcgi: update to version 2.4.7.1 2019-03-05 12:08:20 +01:00
Alyssa Ross 2576d09716 nginxMainline: 1.15.8 -> 1.15.9 (#56416) 2019-02-28 22:13:35 +01:00
Matthew Bauer 5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Izorkin 43e08168cd unit: 1.7 -> 1.7.1 2019-02-08 09:07:23 +03:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +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
R. RyanTM 61bcf59e1d apacheHttpd: 2.4.37 -> 2.4.38
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-httpd/versions
2019-01-28 17:32:40 -08:00
Franz Pletz 3a6cd12a47
tengine: 2.2.2 -> 2.2.3 (security)
Fixes CVE-2018-16843, CVE-2018-16844 and CVE-2018-16845.
2019-01-17 13:26:55 +01:00
Michael Raskin 3bd38b0daa lighttpd: fix tests on Linux
The tests were enabled in #53488 and succeeded on Darwin; on Linux they
still failed because of empty hostname inside the sandbox (we have no
UTS-namespace hostname and I think no /etc/hosts). Nix on Darwin lacks
powerful enough sandboxing, so there were no problems on Darwin.

Patching the tests to fallback to "127.0.0.1" if hostname of the
localhost cannot be retrieved matches the behaviour of lighttpd itself
and allows the tests to pass.

Not sure if having no hostname in the test environment is a bit too
weird for the upstream to care.
2019-01-11 11:46:23 +01:00
Franz Pletz 9ea5b2c052
nginxMainline: 1.15.7 -> 1.15.8 2019-01-11 07:55:25 +01:00
Kirill Elagin a162a562bd
lighttpd: Enable tests
They seem to pass now, so why not.
2019-01-06 13:12:20 +03:00
Kirill Elagin bd141e9af1
lighttpd: Hide attr dependency behind an option
* Unbreak darwin
* It was unused anyway, as it is disabled by default
* Now there is an feature-argument to enable it
2019-01-06 13:12:19 +03:00
Kirill Elagin d94cbd4188
lighttpd: Disable WebDAV by default
* It is disabled by default in lighttpd itself
* Darwin doesn’t seem to have a function in libuiid that it needs
2019-01-06 13:12:14 +03:00
Frederik Rietdijk 070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Vladimír Čunát 4fc5480db2
Merge #51561: tomcat: update minor versions (security) 2018-12-30 09:31:31 +01:00
Frederik Rietdijk 10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
R. RyanTM 12abec6453 couchdb2: 2.2.0 -> 2.3.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/couchdb/versions
2018-12-25 23:16:34 -08:00
Jan Tojnar ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Izorkin eaf136b6b8 unit: 1.6 -> 1.7 2018-12-22 11:23:38 +03:00
Jan Tojnar aead6e12f9
Merge remote-tracking branch 'upstream/master' into staging 2018-12-16 22:55:06 +01:00
Jörg Thalheim 23073717cd
unit: remove perl526, which is EOL
related to https://github.com/NixOS/nixpkgs/pull/52062
2018-12-14 15:50:17 +00:00
Izorkin 6c8b7ac931
unit: add php module 7.3 2018-12-11 20:11:08 +01:00
Jörg Thalheim 8871ffccff nginx: fix cross-build 2018-12-11 18:13:21 +01:00
Graham Christensen 37293152c7
Merge pull request #51612 from Izorkin/nginx-unit
unit: init at v1.6
2018-12-08 11:49:05 -05:00
Izorkin ef5161984c unit: init at v1.6 2018-12-08 19:20:09 +03:00
Will Dietz 05f6ec295f lighttpd: 1.4.51 -> 1.4.52
https://www.lighttpd.net/2018/11/28/1.4.52/
2018-12-07 21:30:51 -06:00
Alyssa Ross 703827f36c nginx: 1.14.1 -> 1.14.2 2018-12-05 10:56:06 -06:00
Averell Dalton 52d21aeff1 tomcat: update minor versions 2018-12-05 11:32:20 +01:00
c0bw3b 0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
Frederik Rietdijk 9db2421d1f Merge master into staging-next 2018-11-29 08:12:56 +01:00
Alyssa Ross dcae76862b nginxMainline: 1.15.6 -> 1.15.7 2018-11-27 21:28:49 +00:00
Frederik Rietdijk 701375662b Merge master into staging-next 2018-11-21 12:39:20 +01:00
R. RyanTM b80c4d7d3d axis2: 1.6.4 -> 1.7.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/axis2/versions
2018-11-19 15:15:40 -08:00
R. RyanTM 2fbbf2fc48 jetty: 9.4.12.v20180830 -> 9.4.14.v20181114
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jetty/versions
2018-11-19 05:11:10 -08:00
Frederik Rietdijk 0d0d7dcd06 Merge staging-next into staging 2018-11-18 10:41:34 +01: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
Renaud f0f0ec0734
Merge pull request #50104 from r-ryantm/auto-update/hiawatha
hiawatha: 10.8.1 -> 10.8.3
2018-11-14 15:15:09 +01:00
Renaud 7a9967583c
Merge pull request #50204 from r-ryantm/auto-update/mod_wsgi
mod_wsgi: 4.6.4 -> 4.6.5
2018-11-14 10:26:13 +01:00
Frederik Rietdijk 1d3bff25db Merge staging-next into staging 2018-11-11 14:28:08 +01:00
R. RyanTM e658a7a549 mod_wsgi: 4.6.4 -> 4.6.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mod_wsgi/versions
2018-11-10 10:57:08 -08:00
R. RyanTM 8e24ea925b apacheHttpd: 2.4.35 -> 2.4.37
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-httpd/versions
2018-11-10 08:43:41 -08:00
R. RyanTM 79ea7e9ef9 hiawatha: 10.8.1 -> 10.8.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hiawatha/versions
2018-11-09 18:14:05 -08:00
Daiderd Jordan 6d71316410
nginx: init ngx_aws_auth at 2.1.1 2018-11-08 20:02:44 +01:00
Franz Pletz 9fe0e57d9d
tomcat_connectors: 1.2.41-dev-1613051 -> 1.2.46
Fixes CVE-2018-11759, CVE-2018-1323, CVE-2016-6808.
2018-11-01 22:37:14 +01:00
R. RyanTM 5bccc53a50 lighttpd: 1.4.50 -> 1.4.51 (#49238)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lighttpd/versions
2018-10-27 07:21:11 -04:00
Rob Vermaas 75167083e5 nginx-opentracing: init at 0.7.0
(cherry picked from commit 9d6184f1bc)
2018-10-23 18:08:01 +02:00
Jörg Thalheim 1937f1ec06
Merge pull request #48503 from r-ryantm/auto-update/jetty
jetty: 9.4.8.v20171121 -> 9.4.12.v20180830
2018-10-19 09:08:35 +01:00
R. RyanTM 43d79c4b9e jetty: 9.4.8.v20171121 -> 9.4.12.v20180830
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jetty/versions
2018-10-15 20:47:19 -07:00
Aaron Andersen 74e6e05479 apacheHttpd: add lynx binary path to apachectl 2018-10-11 20:37:55 -04:00
Thilo Uttendorfer 205b3d94e1 nginxMainline: 1.15.3 -> 1.15.5 (#48127) 2018-10-10 00:18:54 +02:00
Alyssa Ross 7e3b43d75a
webhook: init at 2.6.8 2018-10-05 12:14:49 +01:00
Matthew Bauer 14dbccec78
Merge pull request #47318 from r-ryantm/auto-update/apt-cacher-ng
apt-cacher-ng: 3.1 -> 3.2
2018-09-28 20:55:17 -05:00
R. RyanTM 524c2120f9 apacheHttpd: 2.4.34 -> 2.4.35
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-httpd/versions
2018-09-25 07:25:14 -07:00
R. RyanTM 114a0a8391 apt-cacher-ng: 3.1 -> 3.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apt-cacher-ng/versions
2018-09-25 06:33:07 -07:00
Franz Pletz 647b5b1a29
nginxMainline: 1.15.2 -> 1.15.3 2018-08-31 14:42:14 +02:00
xeji 691ec455a8
Merge pull request #45246 from r-ryantm/auto-update/couchdb
couchdb2: 2.1.2 -> 2.2.0
2018-08-21 20:02:43 +02:00
Vladimír Čunát 14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
R. RyanTM 841d3a5da3 couchdb2: 2.1.2 -> 2.2.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/couchdb/versions.
2018-08-17 04:35:22 -07:00
R. RyanTM 6e1d3cbe6b lighttpd: 1.4.49 -> 1.4.50
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lighttpd/versions.
2018-08-17 06:46:21 +02:00
Jan Malakhovski 6c1a9d9d79 lighttpd: make tests run, but disable 2018-08-11 09:35:32 +00:00
Jan Malakhovski 2481ed88c7 myserver: use checkInputs 2018-08-11 09:35:25 +00:00
Frederik Rietdijk d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Frederik Rietdijk 786cbba7be
Merge pull request #44447 from NixOS/staging-next
Staging next
2018-08-09 09:04:03 +02:00
Austin Seipp 8f8b7e1b86 h2o: fix compatibility with libressl 2.7+
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-08-08 18:59:22 -05:00
xeji 90e72bb769
Merge pull request #44146 from Izorkin/tengine
tengine: init init at v2.2.2
2018-08-08 10:58:25 +02:00
Uli Baum 5a25e17628 tengine: fix build with gcc7 2018-08-07 22:02:39 +02:00
Vladimír Čunát f504af072b
Merge branch 'master' into staging-next
There's been some large rebuild on master.
I don't really have time ATM to find what it was.
2018-08-06 12:07:37 +02:00
Izorkin 5fce5fadf5 tengine: init init at v2.2.2 2018-08-06 08:11:03 +03: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
John Ericson 7a337cde31
Merge pull request #44423 from obsidiansystems/configureFlags-cleanup
treewide: All configureFlags are lists
2018-08-03 17:49:01 -04:00
John Ericson db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
John Ericson 85a9913edd treewide: Make more complicated configureFlags lists 2018-08-03 17:06:03 -04:00
John Ericson 9fb6462817 Merge commit master into staging 2018-07-30 15:33:01 -04:00
Vladimír Čunát 848fa35c24
Merge #43378 into staging: mesa: enableTextureFloats 2018-07-30 08:16:20 +02: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
Anton-Latukha 8f101cce83 rm maintainer eduarrrd from packages, no activity > year 2018-07-22 21:41:48 +03:00
Pascal Wittmann 1ba7fa72e7
axis2: add license
see issue #43716
2018-07-22 17:35:01 +02:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth dda95bae35 [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
R. RyanTM 2c2f107a96 apacheHttpd: 2.4.33 -> 2.4.34
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apache-httpd/versions.
2018-07-18 17:24:59 -07: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
R. RyanTM 20c9b4727c couchdb2: 2.1.1 -> 2.1.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/couchdb/versions.
2018-07-13 04:16:11 -07: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
R. RyanTM fff21f417f yaws: 2.0.5 -> 2.0.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/yaws/versions.

These checks were done:

- built on NixOS
- /nix/store/vc5va0app2hqsv6521jp8xgqdx2pzpl9-yaws-2.0.6/bin/yaws passed the binary check.
- 0 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 2.0.6 with grep in /nix/store/vc5va0app2hqsv6521jp8xgqdx2pzpl9-yaws-2.0.6
- directory tree listing: https://gist.github.com/7cf8f0c6f8d5415c26e238c51d662ef6
- du listing: https://gist.github.com/6966b688f7264a9be53bbb606d4b7852
2018-07-03 13:51:48 -07:00
Anton Latukha c876db629d mbedtls: cmake&ninja, threading, clean-up; hiawatha: options, Nix mbedtls (#41722)
* mbedtls: build with cmake&ninja, clean-up

* mbedtls: cmake ninja Darwin build clean-up

* hiawatha: add build options, use system mbedTLS, platforms -> unix
2018-06-28 21:25:19 +01:00
Matthew Bauer a44d33aac1
Merge pull request #42669 from obsidiansystems/upstream-plist
Upstream PLIST handling
2018-06-28 15:26:31 -04:00