Merge remote-tracking branch 'origin/master'

Author: niemyjski

src/Platforms/Exceptionless.Web/RequestInfoCollector.cs

@@ -24,7 +24,7 @@ public static RequestInfo Collect(HttpContextBase context, ExceptionlessConfigur
             };
 
             try {
-                info.ClientIpAddress = context.Request.UserHostAddress;
+                info.ClientIpAddress = GetUserIPAddress(context);
             } catch (ArgumentException ex) {
                 config.Resolver.GetLog().Error(ex, "An error occurred while setting the Client Ip Address.");
             }
@@ -126,5 +126,15 @@ private static Dictionary<string, string> ToDictionary(this NameValueCollection
 
             return d;
         }
+
+        private static string GetUserIPAddress(HttpContextBase context)
+        {
+            string clientIp = context.Request.ServerVariables["HTTP_X_FORWARDED_FOR"];
+            if (string.IsNullOrEmpty(clientIp))
+            {
+                clientIp = context.Request.UserHostAddress;
+            }
+            return clientIp;
+        }
     }
 }