diff --git a/guides/https.md b/guides/https.md index 7483adb4..124971a1 100644 --- a/guides/https.md +++ b/guides/https.md @@ -51,7 +51,7 @@ The `cacertfile` option is not needed when using a self-signed certificate, or w keyfile: "/etc/letsencrypt/live/example.net/privkey.pem" ``` -It is possible to bundle the certificate files with the application, possibly for packaging into a release. In this case the files must be stored under the application's 'priv' directory. The `otp_app` option must be set to the name of the OTP application that contains the files, in order to correctly resolve the relative paths: +It is possible to bundle the certificate files with the application, possibly for packaging into a release. In this case the files must be stored under the application's 'priv' directory. The `otp_app` option must be set to the name of the OTP application that contains the files, in order to correctly resolve the relative paths: ```elixir Plug.Cowboy.https MyApp.MyPlug, [], diff --git a/lib/plug/rewrite_on.ex b/lib/plug/rewrite_on.ex index e794cb50..07bafcce 100644 --- a/lib/plug/rewrite_on.ex +++ b/lib/plug/rewrite_on.ex @@ -10,10 +10,10 @@ defmodule Plug.RewriteOn do The supported values are: - * `:x_forwarded_for` - to override the remote ip based on on the "x-forwarded-for" header - * `:x_forwarded_host` - to override the host based on on the "x-forwarded-host" header - * `:x_forwarded_port` - to override the port based on on the "x-forwarded-port" header - * `:x_forwarded_proto` - to override the protocol based on on the "x-forwarded-proto" header + * `:x_forwarded_for` - to override the remote ip based on the "x-forwarded-for" header + * `:x_forwarded_host` - to override the host based on the "x-forwarded-host" header + * `:x_forwarded_port` - to override the port based on the "x-forwarded-port" header + * `:x_forwarded_proto` - to override the protocol based on the "x-forwarded-proto" header A tuple representing a Module-Function-Args can also be given as argument instead of a list. diff --git a/lib/plug/static.ex b/lib/plug/static.ex index 7fc2d495..8ffb7d48 100644 --- a/lib/plug/static.ex +++ b/lib/plug/static.ex @@ -167,7 +167,8 @@ defmodule Plug.Static do %{ encodings: encodings, only_rules: {Keyword.get(opts, :only, []), Keyword.get(opts, :only_matching, [])}, - qs_cache: Keyword.get(opts, :cache_control_for_vsn_requests, "public, max-age=31536000, immutable"), + qs_cache: + Keyword.get(opts, :cache_control_for_vsn_requests, "public, max-age=31536000, immutable"), et_cache: Keyword.get(opts, :cache_control_for_etags, "public"), et_generation: Keyword.get(opts, :etag_generation, nil), headers: Keyword.get(opts, :headers, %{}),