Merge branch 'master' of github.com:meetup/meetup-web-platform

meetup · Aug 17, 2017 · dccfe2b · dccfe2b
2 parents b3c0e5a + 436cfed
commit dccfe2b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/renderers/server-render.jsx b/src/renderers/server-render.jsx
@@ -213,11 +213,12 @@ const makeRenderer = (
 		raw: { req },
 	} = request;
 
-	// request protocol might be different from original request that hit proxy
-	// we want to use the proxy's protocol
+	// request protocol and host might be different from original request that hit proxy
+	// we want to use the proxy's protocol and host
 	const requestProtocol =
 		headers['x-forwarded-proto'] || connection.info.protocol;
-	const host = `${requestProtocol}://${info.host}`;
+	const domain = headers['x-forwarded-host'] || info.host;
+	const host = `${requestProtocol}://${domain}`;
 	const apiUrl = '/mu_api';
 
 	// create the store