Skip to content

Commit

Permalink
Merge pull request #28718 from CamSoper/http2
Browse files Browse the repository at this point in the history
  • Loading branch information
PRmerger authored Aug 9, 2016
2 parents 7df244e + de63fb1 commit 764f4a5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions articles/cdn/cdn-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ms.tgt_pltfrm="na"
ms.devlang="na"
ms.topic="hero-article"
ms.date="07/28/2016"
ms.date="08/09/2016"
ms.author="casoper"/>

# Overview of the Azure Content Delivery Network (CDN)
Expand All @@ -39,7 +39,7 @@ The benefits of using the CDN to cache web site assets include:

3. The origin returns the file to the edge server, including optional HTTP headers describing the file's Time-to-Live (TTL).

4. The edge server caches the file and returns the file to the original requestor (Alice). The file will remain cached on the edge server until the TTL expires. If the origin didn't specify a TTL, the default TTL is 7 days.
4. The edge server caches the file and returns the file to the original requestor (Alice). The file remains cached on the edge server until the TTL expires. If the origin didn't specify a TTL, the default TTL is seven days.

5. Additional users (like Bob) may then request the same file using that same URL, and may also be directed to that same POP.

Expand All @@ -57,6 +57,7 @@ There are three Azure CDN products: **Azure CDN Standard from Akamai**, **Azure
| Load balancing | **✓** | **✓** | **✓** |
| DDOS protection | **✓** | **✓** | **✓** |
| IPv4/IPv6 dual-stack | **✓** | **✓** | **✓** |
| [HTTP/2](https://msdn.microsoft.com/library/mt762901.aspx) | **✓** | | |
| [Custom domain name support](cdn-map-content-to-custom-domain.md) | **✓** | **✓** | **✓** |
| [Query string caching](cdn-query-string.md) | **✓** | **✓** | **✓** |
| [Country filtering](cdn-restrict-access-by-country.md) | | **✓** | **✓** |
Expand Down

0 comments on commit 764f4a5

Please sign in to comment.