Revert "Keep the fix conservative to avoid potential compatibility issues"

This reverts commit ccb99f0.

Author: claudiamurialdo

dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs

@@ -260,7 +260,10 @@ public void ConfigureServices(IServiceCollection services)
 			{
 				options.IdleTimeout = TimeSpan.FromMinutes(Preferences.SessionTimeout);
 				options.Cookie.HttpOnly = true;
-				options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
+				if (Preferences.HttpProtocolSecure()) 
+					options.Cookie.SecurePolicy = CookieSecurePolicy.Always;
+				else
+					options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
 				options.Cookie.IsEssential = true;
 				string sessionCookieName = GxWebSession.GetSessionCookieName(VirtualPath);
 				if (!string.IsNullOrEmpty(sessionCookieName))
@@ -565,7 +568,7 @@ public void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IHos
 			}
 			app.UseForwardedHeaders(new ForwardedHeadersOptions
 			{
-				ForwardedHeaders = ForwardedHeaders.XForwardedProto
+				ForwardedHeaders = ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedFor
 			});
 			if (GXUtil.CompressResponse())
 			{