guard against reading properties from disposed request

ServiceStack · Nov 3, 2016 · 6de55a4 · 6de55a4
1 parent 8aab3f2
commit 6de55a4
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/ServiceStack/Host/InMemoryRollingRequestLogger.cs b/src/ServiceStack/Host/InMemoryRollingRequestLogger.cs
@@ -70,20 +70,29 @@ protected RequestLogEntry CreateEntry(IRequest request, object requestDto, objec
                 entry.ForwardedFor = request.Headers[HttpHeaders.XForwardedFor];
                 entry.Referer = request.Headers[HttpHeaders.Referer];
                 entry.Headers = request.Headers.ToDictionary();
-                entry.UserAuthId = request.GetItemOrCookie(HttpHeaders.XUserAuthId);
-                entry.SessionId = request.GetSessionId();
+                entry.UserAuthId = request.GetItemStringValue(HttpHeaders.XUserAuthId);
                 entry.Items = SerializableItems(request.Items);
                 entry.Session = EnableSessionTracking ? request.GetSession() : null;
             }
 
+            var isClosed = request.Response.IsClosed;
+            if (!isClosed)
+            {
+                entry.UserAuthId = request.GetItemOrCookie(HttpHeaders.XUserAuthId);
+                entry.SessionId = request.GetSessionId();
+            }
+
             if (HideRequestBodyForRequestDtoTypes != null
                 && requestType != null
                 && !HideRequestBodyForRequestDtoTypes.Contains(requestType))
             {
                 entry.RequestDto = requestDto;
                 if (request != null)
                 {
-                    entry.FormData = request.FormData.ToDictionary();
+                    if (!isClosed)
+                    {
+                        entry.FormData = request.FormData.ToDictionary();
+                    }
 
                     if (EnableRequestBodyTracking)
                     {