Skip to content

Commit c1dec42

Browse files
committed
Merge remote-tracking branch 'Stash/release/2.2.8' into release/2.2
2 parents 67c24be + e1681e5 commit c1dec42

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Sdl.Web.Common/Utils/UrlEncoding.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,17 @@ public static string UrlPartialPathEncode(string url)
8282
char c = url[i];
8383
switch (c)
8484
{
85+
case ' ': urlCopy.Append("%20"); break;
8586
case '!': urlCopy.Append("%21"); break;
8687
case '"': urlCopy.Append("%22"); break;
8788
case '#': urlCopy.Append("%23"); break;
8889
case '$': urlCopy.Append("%24"); break;
89-
case '%': urlCopy.Append("%25"); break;
9090
case '&': urlCopy.Append("%26"); break;
9191
case '\'': urlCopy.Append("%27"); break;
9292
case '(': urlCopy.Append("%28"); break;
9393
case ')': urlCopy.Append("%29"); break;
9494
case '*': urlCopy.Append("%2A"); break;
95+
case '+': urlCopy.Append("%2B"); break;
9596
case ',': urlCopy.Append("%2C"); break;
9697
case ':': urlCopy.Append("%3A"); break;
9798
case ';': urlCopy.Append("%3B"); break;

Sdl.Web.Mvc/Statics/StaticContentModule.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ private static void SendNotFoundResponse(string message, HttpResponse httpRespon
198198

199199
private static void SendHealthCheckResponse(HttpResponse httpResponse)
200200
{
201-
Log.Warn("Sending HTTP 200 (OK) response.");
202201
httpResponse.StatusCode = (int)HttpStatusCode.OK;
203202
httpResponse.ContentType = "text/plain";
204203
httpResponse.Write("DXA Health Check OK.");

Site/DxaWebApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<SdlWebContextClientPackageVersion>11.0.0</SdlWebContextClientPackageVersion>
3030
<SdlWebContextImagePackageVersion>11.0.0</SdlWebContextImagePackageVersion>
3131
<SdlWebDataModelPackageVersion>2.2.0</SdlWebDataModelPackageVersion>
32-
<DxaFrameworkPackageVersion>2.2.2</DxaFrameworkPackageVersion>
32+
<DxaFrameworkPackageVersion>2.2.6</DxaFrameworkPackageVersion>
3333
</PropertyGroup>
3434
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
3535
<DebugSymbols>true</DebugSymbols>

0 commit comments

Comments
 (0)