-
Notifications
You must be signed in to change notification settings - Fork 165
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #445 from NLog/release/4.8.4
Release 4.8.4
- Loading branch information
Showing
15 changed files
with
161 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| using System; | ||
| #if !ASP_NET_CORE | ||
| using System.Web; | ||
| #else | ||
| using System.Text; | ||
| using Microsoft.AspNetCore.Http; | ||
| using Microsoft.AspNetCore.Http.Features; | ||
| #endif | ||
| using NLog.Common; | ||
|
|
||
| namespace NLog.Web.Internal | ||
| { | ||
| internal static class HttpContextExtensions | ||
| { | ||
| #if !ASP_NET_CORE | ||
| internal static HttpRequestBase TryGetRequest(this HttpContextBase context) | ||
| { | ||
| try | ||
| { | ||
| var request = context?.Request; | ||
| if (request == null) | ||
| InternalLogger.Debug("HttpContext Request Lookup returned null"); | ||
| return request; | ||
| } | ||
| catch (HttpException ex) | ||
| { | ||
| InternalLogger.Debug(ex, "HttpContext Request Lookup failed."); | ||
| return null; | ||
| } | ||
| } | ||
| #else | ||
| internal static HttpRequest TryGetRequest(this HttpContext context) | ||
| { | ||
| var request = context?.Request; | ||
| if (request == null) | ||
| InternalLogger.Debug("HttpContext Request Lookup returned null"); | ||
| return request; | ||
| } | ||
| #endif | ||
|
|
||
| #if ASP_NET_CORE | ||
| internal static string GetString(this ISession session, string key) | ||
| { | ||
| if (!session.TryGetValue(key, out var data)) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| if (data == null) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| if (data.Length == 0) | ||
| { | ||
| return string.Empty; | ||
| } | ||
|
|
||
| return Encoding.UTF8.GetString(data); | ||
| } | ||
| #endif | ||
|
|
||
| #if !ASP_NET_CORE | ||
| internal static HttpSessionStateBase TryGetSession(this HttpContextBase context) | ||
| { | ||
| var session = context?.Session; | ||
| if (session == null) | ||
| InternalLogger.Debug("HttpContext Session Lookup returned null"); | ||
| return session; | ||
| } | ||
| #else | ||
| internal static ISession TryGetSession(this HttpContext context) | ||
| { | ||
| try | ||
| { | ||
| if (context?.Features.Get<ISessionFeature>()?.Session != null) | ||
| { | ||
| var session = context?.Session; | ||
| if (session == null) | ||
| InternalLogger.Debug("HttpContext Session Lookup returned null"); | ||
| return session; | ||
| } | ||
| else | ||
| { | ||
| InternalLogger.Debug("HttpContext Session Feature not available"); | ||
| return null; | ||
| } | ||
| } | ||
| catch (InvalidOperationException ex) | ||
| { | ||
| InternalLogger.Debug(ex, "HttpContext Session Lookup failed."); | ||
| return null; // System.InvalidOperationException: Session has not been configured for this application or request. | ||
| } | ||
| } | ||
| #endif | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.