Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions aspnetcore/blazor/call-web-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -397,5 +397,10 @@ For general information on CORS with ASP.NET Core apps, see <xref:security/cors>
* <xref:blazor/security/webassembly/additional-scenarios>: Includes coverage on using <xref:System.Net.Http.HttpClient> to make secure web API requests.
* <xref:fundamentals/http-requests>
* <xref:security/enforcing-ssl>
::: moniker range=">= aspnetcore-5.0"
* [Kestrel HTTPS endpoint configuration](xref:fundamentals/servers/kestrel/endpoints)
::: moniker-end
::: moniker range="< aspnetcore-5.0"
* [Kestrel HTTPS endpoint configuration](xref:fundamentals/servers/kestrel#endpoint-configuration)
::: moniker-end
* [Cross Origin Resource Sharing (CORS) at W3C](https://www.w3.org/TR/cors/)
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<p>Adjust the domains and ports of <code>WithOrigins</code> as needed for the Blazor app.</p>

<p>By default, ASP.NET Core apps use ports 5000 (HTTP) and 5001 (HTTPS). To run both apps on the same machine at the same time for testing, use a different port for the web API app (for example, port 10000). For more information on setting the port, see the <a href="https://docs.microsoft.com/aspnet/core/fundamentals/servers/kestrel#endpoint-configuration">Kestrel web server implementation: Endpoint configuration</a>.</p>
<p>By default, ASP.NET Core apps use ports 5000 (HTTP) and 5001 (HTTPS). To run both apps on the same machine at the same time for testing, use a different port for the web API app (for example, port 10000). For more information on setting the port, see the <a href="https://docs.microsoft.com/aspnet/core/fundamentals/servers/kestrel/endpoints">Kestrel web server implementation: Endpoint configuration</a>.</p>

<h3>Todo Items</h3>

Expand Down
6 changes: 3 additions & 3 deletions aspnetcore/fundamentals/host/generic-host.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ The <xref:Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder*> method:
The <xref:Microsoft.Extensions.Hosting.GenericHostBuilderExtensions.ConfigureWebHostDefaults*> method:

* Loads host configuration from environment variables prefixed with `ASPNETCORE_`.
* Sets [Kestrel](xref:fundamentals/servers/kestrel) server as the web server and configures it using the app's hosting configuration providers. For the Kestrel server's default options, see <xref:fundamentals/servers/kestrel#kestrel-options>.
* Adds [Host Filtering middleware](xref:fundamentals/servers/kestrel#host-filtering).
* Sets [Kestrel](xref:fundamentals/servers/kestrel) server as the web server and configures it using the app's hosting configuration providers. For the Kestrel server's default options, see <xref:fundamentals/servers/kestrel/options>.
* Adds [Host Filtering middleware](xref:fundamentals/servers/kestrel/host-filtering).
* Adds [Forwarded Headers middleware](xref:host-and-deploy/proxy-load-balancer#forwarded-headers) if `ASPNETCORE_FORWARDEDHEADERS_ENABLED` equals `true`.
* Enables IIS integration. For the IIS default options, see <xref:host-and-deploy/iis/index#iis-options>.

Expand Down Expand Up @@ -420,7 +420,7 @@ To set this value, use the environment variable or call `UseUrls`:
webBuilder.UseUrls("http://*:5000;http://localhost:5001;https://hostname:5002");
```

Kestrel has its own endpoint configuration API. For more information, see <xref:fundamentals/servers/kestrel#endpoint-configuration>.
Kestrel has its own endpoint configuration API. For more information, see <xref:fundamentals/servers/kestrel/endpoints>.

### WebRoot

Expand Down
10 changes: 10 additions & 0 deletions aspnetcore/fundamentals/host/web-host.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ The code that calls `CreateDefaultBuilder` is in a method named `CreateWebHostBu

`CreateDefaultBuilder` performs the following tasks:

::: moniker range=">= aspnetcore-5.0"
* Configures [Kestrel](xref:fundamentals/servers/kestrel) server as the web server using the app's hosting configuration providers. For the Kestrel server's default options, see <xref:fundamentals/servers/kestrel/options>.
::: moniker-end
::: moniker range="< aspnetcore-5.0"
* Configures [Kestrel](xref:fundamentals/servers/kestrel) server as the web server using the app's hosting configuration providers. For the Kestrel server's default options, see <xref:fundamentals/servers/kestrel#kestrel-options>.
::: moniker-end
* Sets the [content root](xref:fundamentals/index#content-root) to the path returned by [Directory.GetCurrentDirectory](/dotnet/api/system.io.directory.getcurrentdirectory).
* Loads [host configuration](#host-configuration-values) from:
* Environment variables prefixed with `ASPNETCORE_` (for example, `ASPNETCORE_ENVIRONMENT`).
Expand Down Expand Up @@ -329,7 +334,12 @@ WebHost.CreateDefaultBuilder(args)
.UseUrls("http://*:5000;http://localhost:5001;https://hostname:5002")
```

::: moniker range=">= aspnetcore-5.0"
Kestrel has its own endpoint configuration API. For more information, see <xref:fundamentals/servers/kestrel/endpoints>.
::: moniker-end
::: moniker range="< aspnetcore-5.0"
Kestrel has its own endpoint configuration API. For more information, see <xref:fundamentals/servers/kestrel#endpoint-configuration>.
::: moniker-end

### Shutdown Timeout

Expand Down
25 changes: 24 additions & 1 deletion aspnetcore/fundamentals/servers/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,30 @@ A *launchSettings.json* file provides configuration when launching an app with `

[HTTP/2](https://httpwg.org/specs/rfc7540.html) is supported with ASP.NET Core in the following deployment scenarios:

::: moniker range=">= aspnetcore-2.2"
::: moniker range=">= aspnetcore-5.0"

* [Kestrel](xref:fundamentals/servers/kestrel/http2)
* Operating system
* Windows Server 2016/Windows 10 or later&dagger;
* Linux with OpenSSL 1.0.2 or later (for example, Ubuntu 16.04 or later)
* HTTP/2 will be supported on macOS in a future release.
* Target framework: .NET Core 2.2 or later
* [HTTP.sys](xref:fundamentals/servers/httpsys#http2-support)
* Windows Server 2016/Windows 10 or later
* Target framework: Not applicable to HTTP.sys deployments.
* [IIS (in-process)](xref:host-and-deploy/iis/index#http2-support)
* Windows Server 2016/Windows 10 or later; IIS 10 or later
* Target framework: .NET Core 2.2 or later
* [IIS (out-of-process)](xref:host-and-deploy/iis/index#http2-support)
* Windows Server 2016/Windows 10 or later; IIS 10 or later
* Public-facing edge server connections use HTTP/2, but the reverse proxy connection to Kestrel uses HTTP/1.1.
* Target framework: Not applicable to IIS out-of-process deployments.

&dagger;Kestrel has limited support for HTTP/2 on Windows Server 2012 R2 and Windows 8.1. Support is limited because the list of supported TLS cipher suites available on these operating systems is limited. A certificate generated using an Elliptic Curve Digital Signature Algorithm (ECDSA) may be required to secure TLS connections.

::: moniker-end

::: moniker range=">= aspnetcore-2.2 < aspnetcore-5.0"

* [Kestrel](xref:fundamentals/servers/kestrel#http2-support)
* Operating system
Expand Down
Loading