Reformat JustAMan review pt3 changes

13 files changed, 34 insertions, 33 deletions

diff --git a/SocketHttpListener/Ext.cs b/SocketHttpListener/Ext.cs
index b9894ca8f..b051b6718 100644
--- a/SocketHttpListener/Ext.cs
+++ b/SocketHttpListener/Ext.cs
@@ -161,7 +161,7 @@ namespace SocketHttpListener
 
         internal static bool Contains<T>(this IEnumerable<T> source, Func<T, bool> condition)
         {
-            foreach (var elm in source)
+            foreach (T elm in source)
                 if (condition(elm))
                     return true;
 
diff --git a/SocketHttpListener/Net/ChunkedInputStream.cs b/SocketHttpListener/Net/ChunkedInputStream.cs
index 8d59a7907..06dcb3a17 100644
--- a/SocketHttpListener/Net/ChunkedInputStream.cs
+++ b/SocketHttpListener/Net/ChunkedInputStream.cs
@@ -73,7 +73,7 @@ namespace SocketHttpListener.Net
 
         protected override int ReadCore(byte[] buffer, int offset, int count)
         {
-            var ares = BeginReadCore(buffer, offset, count, null, null);
+            IAsyncResult ares = BeginReadCore(buffer, offset, count, null, null);
             return EndRead(ares);
         }
 
@@ -115,7 +115,7 @@ namespace SocketHttpListener.Net
 
         private void OnRead(IAsyncResult base_ares)
         {
-            var rb = (ReadBufferState)base_ares.AsyncState;
+            ReadBufferState rb = (ReadBufferState)base_ares.AsyncState;
             var ares = rb.Ares;
             try
             {
diff --git a/SocketHttpListener/Net/HttpConnection.cs b/SocketHttpListener/Net/HttpConnection.cs
index e87503118..af1c081d9 100644
--- a/SocketHttpListener/Net/HttpConnection.cs
+++ b/SocketHttpListener/Net/HttpConnection.cs
@@ -269,7 +269,7 @@ namespace SocketHttpListener.Net
                     Close(true);
                     return;
                 }
-                var listener = _epl.Listener;
+                HttpListener listener = _epl.Listener;
                 if (_lastListener != listener)
                 {
                     RemoveConnection();
@@ -417,7 +417,7 @@ namespace SocketHttpListener.Net
         {
             try
             {
-                var response = _context.Response;
+                HttpListenerResponse response = _context.Response;
                 response.StatusCode = status;
                 response.ContentType = "text/html";
                 string description = HttpStatusDescription.Get(status);
@@ -509,7 +509,7 @@ namespace SocketHttpListener.Net
                     return;
                 }
 
-                var s = _socket;
+                Socket s = _socket;
                 _socket = null;
                 try
                 {
diff --git a/SocketHttpListener/Net/HttpEndPointListener.cs b/SocketHttpListener/Net/HttpEndPointListener.cs
index c78d186c5..ea7d8fd2d 100644
--- a/SocketHttpListener/Net/HttpEndPointListener.cs
+++ b/SocketHttpListener/Net/HttpEndPointListener.cs
@@ -277,7 +277,7 @@ namespace SocketHttpListener.Net
         public bool BindContext(HttpListenerContext context)
         {
             var req = context.Request;
-            var listener = SearchListener(req.Url, out var prefix);
+            HttpListener listener = SearchListener(req.Url, out var prefix);
             if (listener == null)
                 return false;
 
@@ -309,7 +309,7 @@ namespace SocketHttpListener.Net
 
             if (host != null && host != "")
             {
-                var localPrefixes = _prefixes;
+                Dictionary<ListenerPrefix, HttpListener> localPrefixes = _prefixes;
                 foreach (var p in localPrefixes.Keys)
                 {
                     string ppath = p.Path;
@@ -330,7 +330,7 @@ namespace SocketHttpListener.Net
                     return bestMatch;
             }
 
-            var list = _unhandledPrefixes;
+            List<ListenerPrefix> list = _unhandledPrefixes;
             bestMatch = MatchFromList(host, path, list, out prefix);
 
             if (path != pathSlash && bestMatch == null)
@@ -360,7 +360,7 @@ namespace SocketHttpListener.Net
             HttpListener bestMatch = null;
             int bestLength = -1;
 
-            foreach (var p in list)
+            foreach (ListenerPrefix p in list)
             {
                 string ppath = p.Path;
                 if (ppath.Length < bestLength)
@@ -382,7 +382,7 @@ namespace SocketHttpListener.Net
             if (list == null)
                 return;
 
-            foreach (var p in list)
+            foreach (ListenerPrefix p in list)
             {
                 if (p.Path == prefix.Path)
                     throw new Exception("net_listener_already");
@@ -398,7 +398,7 @@ namespace SocketHttpListener.Net
             int c = list.Count;
             for (int i = 0; i < c; i++)
             {
-                var p = list[i];
+                ListenerPrefix p = list[i];
                 if (p.Path == prefix.Path)
                 {
                     list.RemoveAt(i);
@@ -413,7 +413,7 @@ namespace SocketHttpListener.Net
             if (_prefixes.Count > 0)
                 return;
 
-            var list = _unhandledPrefixes;
+            List<ListenerPrefix> list = _unhandledPrefixes;
             if (list != null && list.Count > 0)
                 return;
 
@@ -433,7 +433,7 @@ namespace SocketHttpListener.Net
                 // Clone the list because RemoveConnection can be called from Close
                 var connections = new List<HttpConnection>(_unregisteredConnections.Keys);
 
-                foreach (var c in connections)
+                foreach (HttpConnection c in connections)
                     c.Close(true);
                 _unregisteredConnections.Clear();
             }
diff --git a/SocketHttpListener/Net/HttpEndPointManager.cs b/SocketHttpListener/Net/HttpEndPointManager.cs
index 07b6331f2..a75af5f5d 100644
--- a/SocketHttpListener/Net/HttpEndPointManager.cs
+++ b/SocketHttpListener/Net/HttpEndPointManager.cs
@@ -74,7 +74,7 @@ namespace SocketHttpListener.Net
                 throw new HttpListenerException((int)HttpStatusCode.BadRequest, "net_invalid_path");
 
             // listens on all the interfaces if host name cannot be parsed by IPAddress.
-            var epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
+            HttpEndPointListener epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
             epl.AddPrefix(lp, listener);
         }
 
@@ -185,7 +185,7 @@ namespace SocketHttpListener.Net
             if (lp.Path.IndexOf("//", StringComparison.Ordinal) != -1)
                 return;
 
-            var epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
+            HttpEndPointListener epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
             epl.RemovePrefix(lp, listener);
         }
     }
diff --git a/SocketHttpListener/Net/HttpListenerContext.Managed.cs b/SocketHttpListener/Net/HttpListenerContext.Managed.cs
index 4cdb6882e..a6622c479 100644
--- a/SocketHttpListener/Net/HttpListenerContext.Managed.cs
+++ b/SocketHttpListener/Net/HttpListenerContext.Managed.cs
@@ -44,7 +44,7 @@ namespace SocketHttpListener.Net
         }
 
         internal IPrincipal ParseBasicAuthentication(string authData) =>
-            TryParseBasicAuth(authData, out var errorCode, out string username, out string password) ?
+            TryParseBasicAuth(authData, out HttpStatusCode errorCode, out string username, out string password) ?
                 new GenericPrincipal(new HttpListenerBasicIdentity(username, password), Array.Empty<string>()) :
                 null;
 
diff --git a/SocketHttpListener/Net/HttpListenerRequest.Managed.cs b/SocketHttpListener/Net/HttpListenerRequest.Managed.cs
index 41d075045..3f9e32f08 100644
--- a/SocketHttpListener/Net/HttpListenerRequest.Managed.cs
+++ b/SocketHttpListener/Net/HttpListenerRequest.Managed.cs
@@ -180,7 +180,7 @@ namespace SocketHttpListener.Net
 
             if (string.Compare(Headers[HttpKnownHeaderNames.Expect], "100-continue", StringComparison.OrdinalIgnoreCase) == 0)
             {
-                var output = _context.Connection.GetResponseStream();
+                HttpResponseStream output = _context.Connection.GetResponseStream();
                 output.InternalWrite(s_100continue, 0, s_100continue.Length);
             }
         }
@@ -256,7 +256,7 @@ namespace SocketHttpListener.Net
             {
                 try
                 {
-                    var ares = InputStream.BeginRead(bytes, 0, length, null, null);
+                    IAsyncResult ares = InputStream.BeginRead(bytes, 0, length, null, null);
                     if (!ares.IsCompleted && !ares.AsyncWaitHandle.WaitOne(1000))
                         return false;
                     if (InputStream.EndRead(ares) <= 0)
diff --git a/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs b/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
index 52e70b68b..7b4b619e6 100644
--- a/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
+++ b/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
@@ -94,10 +94,10 @@ namespace SocketHttpListener.Net
 
             // Try to check the raw path using first the primary encoding (according to http.sys settings);
             // if it fails try the secondary encoding.
-            var result = BuildRequestUriUsingRawPath(GetEncoding(EncodingType.Primary));
+            ParsingResult result = BuildRequestUriUsingRawPath(GetEncoding(EncodingType.Primary));
             if (result == ParsingResult.EncodingError)
             {
-                var secondaryEncoding = GetEncoding(EncodingType.Secondary);
+                Encoding secondaryEncoding = GetEncoding(EncodingType.Secondary);
                 result = BuildRequestUriUsingRawPath(secondaryEncoding);
             }
             isValid = (result == ParsingResult.Success) ? true : false;
@@ -136,7 +136,7 @@ namespace SocketHttpListener.Net
             _requestUriString.Append(Uri.SchemeDelimiter);
             _requestUriString.Append(_cookedUriHost);
 
-            var result = ParseRawPath(encoding);
+            ParsingResult result = ParseRawPath(encoding);
             if (result == ParsingResult.Success)
             {
                 _requestUriString.Append(_cookedUriQuery);
@@ -263,7 +263,7 @@ namespace SocketHttpListener.Net
 
         private bool AddPercentEncodedOctetToRawOctetsList(Encoding encoding, string escapedCharacter)
         {
-            if (!byte.TryParse(escapedCharacter, NumberStyles.HexNumber, null, out var encodedValue))
+            if (!byte.TryParse(escapedCharacter, NumberStyles.HexNumber, null, out byte encodedValue))
             {
                 //if (NetEventSource.IsEnabled) NetEventSource.Error(this, SR.Format(SR.net_log_listener_cant_convert_percent_value, escapedCharacter));
                 return false;
diff --git a/SocketHttpListener/Net/HttpResponseStream.Managed.cs b/SocketHttpListener/Net/HttpResponseStream.Managed.cs
index cda4fe8bc..5d02a9c95 100644
--- a/SocketHttpListener/Net/HttpResponseStream.Managed.cs
+++ b/SocketHttpListener/Net/HttpResponseStream.Managed.cs
@@ -70,7 +70,7 @@ namespace SocketHttpListener.Net
         private void DisposeCore()
         {
             byte[] bytes = null;
-            var ms = GetHeaders(true);
+            MemoryStream ms = GetHeaders(true);
             bool chunked = _response.SendChunked;
             if (_stream.CanWrite)
             {
@@ -110,7 +110,7 @@ namespace SocketHttpListener.Net
 
             if (_stream.CanWrite)
             {
-                var ms = GetHeaders(closing: false, isWebSocketHandshake: true);
+                MemoryStream ms = GetHeaders(closing: false, isWebSocketHandshake: true);
                 bool chunked = _response.SendChunked;
 
                 long start = ms.Position;
@@ -146,7 +146,7 @@ namespace SocketHttpListener.Net
                     return null;
                 }
 
-                var ms = new MemoryStream();
+                MemoryStream ms = new MemoryStream();
                 _response.SendHeaders(closing, ms, isWebSocketHandshake);
                 return ms;
             }
@@ -190,7 +190,7 @@ namespace SocketHttpListener.Net
                 return;
 
             byte[] bytes = null;
-            var ms = GetHeaders(false);
+            MemoryStream ms = GetHeaders(false);
             bool chunked = _response.SendChunked;
             if (ms != null)
             {
@@ -234,7 +234,7 @@ namespace SocketHttpListener.Net
             }
 
             byte[] bytes = null;
-            var ms = GetHeaders(false);
+            MemoryStream ms = GetHeaders(false);
             bool chunked = _response.SendChunked;
             if (ms != null)
             {
diff --git a/SocketHttpListener/Net/WebHeaderCollection.cs b/SocketHttpListener/Net/WebHeaderCollection.cs
index c56d2ef38..34fca808b 100644
--- a/SocketHttpListener/Net/WebHeaderCollection.cs
+++ b/SocketHttpListener/Net/WebHeaderCollection.cs
@@ -208,7 +208,7 @@ namespace SocketHttpListener.Net
             if (!IsHeaderName(headerName))
                 throw new ArgumentException("Invalid character in header");
 
-            if (!headers.TryGetValue(headerName, out var info))
+            if (!headers.TryGetValue(headerName, out HeaderInfo info))
                 return false;
 
             var flag = response ? HeaderInfo.Response : HeaderInfo.Request;
@@ -312,7 +312,7 @@ namespace SocketHttpListener.Net
             if (headerName == null)
                 return false;
 
-            return headers.TryGetValue(headerName, out var info) && (info & HeaderInfo.MultiValue) != 0;
+            return headers.TryGetValue(headerName, out HeaderInfo info) && (info & HeaderInfo.MultiValue) != 0;
         }
 
         internal static bool IsHeaderValue(string value)
diff --git a/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs b/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
index 5f77ff565..1cfd2dc90 100644
--- a/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
+++ b/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
@@ -16,8 +16,8 @@ namespace SocketHttpListener.Net.WebSockets
             ValidateOptions(subProtocol, receiveBufferSize, MinSendBufferSize, keepAliveInterval);
 
             // get property will create a new response if one doesn't exist.
-            var response = context.Response;
-            var request = context.Request;
+            HttpListenerResponse response = context.Response;
+            HttpListenerRequest request = context.Request;
             ValidateWebSocketHeaders(context);
 
             string secWebSocketVersion = request.Headers[HttpKnownHeaderNames.SecWebSocketVersion];
diff --git a/SocketHttpListener/Net/WebSockets/WebSocketValidate.cs b/SocketHttpListener/Net/WebSockets/WebSocketValidate.cs
index 3f61e55fc..0469e3b6c 100644
--- a/SocketHttpListener/Net/WebSockets/WebSocketValidate.cs
+++ b/SocketHttpListener/Net/WebSockets/WebSocketValidate.cs
@@ -20,7 +20,7 @@ namespace SocketHttpListener.Net.WebSockets
 
             if (validStates != null && validStates.Length > 0)
             {
-                foreach (var validState in validStates)
+                foreach (WebSocketState validState in validStates)
                 {
                     if (currentState == validState)
                     {
diff --git a/SocketHttpListener/WebSocket.cs b/SocketHttpListener/WebSocket.cs
index e5b3f89bc..bf400599d 100644
--- a/SocketHttpListener/WebSocket.cs
+++ b/SocketHttpListener/WebSocket.cs
@@ -78,6 +78,7 @@ namespace SocketHttpListener
             init();
         }
 
+        // In the .NET Framework, this pulls the value from a P/Invoke.  Here we just hardcode it to a reasonable default.
         public static TimeSpan DefaultKeepAliveInterval => TimeSpan.FromSeconds(30);
 
         #endregion