Merge pull request #19173 from edx/nadeem/OPS-3445

Upgrade gunicorn to 19.0 and make upgrade (OPS-3445)

common/djangoapps/track/views/__init__.py

@@ -96,6 +96,8 @@ def server_track(request, event_type, event, page=None):
     except:
         username = "anonymous"
 
+    host_header = 'HTTP_HOST' if request is not None and 'HTTP_HOST' in request.META else 'SERVER_NAME'
+
     # define output:
     event = {
         "username": username,
@@ -108,7 +110,7 @@ def server_track(request, event_type, event, page=None):
         "agent": _get_request_header(request, 'HTTP_USER_AGENT').decode('latin1'),
         "page": page,
         "time": datetime.datetime.utcnow().replace(tzinfo=pytz.utc),
-        "host": _get_request_header(request, 'SERVER_NAME'),
+        "host": _get_request_header(request, host_header),
         "context": eventtracker.get_tracker().resolve_context(),
     }
 

common/djangoapps/util/views.py

@@ -388,6 +388,8 @@ def get_feedback_form_context(request):
 
     context["additional_info"] = {}
 
+    host_header = 'HTTP_HOST' if request is not None and 'HTTP_HOST' in request.META else 'SERVER_NAME'
+
     if request.user.is_authenticated:
         context["realname"] = request.user.profile.name
         context["email"] = request.user.email
@@ -397,7 +399,7 @@ def get_feedback_form_context(request):
         context["email"] = request.POST["email"]
 
     for header, pretty in [("HTTP_REFERER", "Page"), ("HTTP_USER_AGENT", "Browser"), ("REMOTE_ADDR", "Client IP"),
-                           ("SERVER_NAME", "Host")]:
+                           (host_header, "Host")]:
         context["additional_info"][pretty] = request.META.get(header)
 
     context["support_email"] = configuration_helpers.get_value('email_from_address', settings.DEFAULT_FROM_EMAIL)