Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 70ed39d8995e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eeb373386f91
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 8, 2019

  1. nixos/nginx: support h2c

    @w4
    w4 committed Mar 8, 2019
    Copy the full SHA
    04425c6 View commit details

  2. Merge pull request #55192 from JordanForks/master 

    nixos/nginx: support h2c
    @infinisil
    infinisil authored Mar 8, 2019
    Copy the full SHA
    eeb3733 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/web-servers/nginx/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/web-servers/nginx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -197,7 +197,7 @@ let
listenString = { addr, port, ssl, extraParameters ? [], ... }:
"listen ${addr}:${toString port} "
+ optionalString ssl "ssl "
+ optionalString (ssl && vhost.http2) "http2 "
+ optionalString vhost.http2 "http2 "
+ optionalString vhost.default "default_server "
+ optionalString (extraParameters != []) (concatStringsSep " " extraParameters)
+ ";";