T9293.patch
sgielen (Sjors Gielen)
Actions

Authored By

	sgielen
	Aug 31 2015, 3:30 PM

Size

870 B

Referenced Files

None

Subscribers

None

T9293.patch
View Options

	commit 33c3ebe0606580efc22c410f654a9fa76655779a
	Author: Sjors Gielen <sjors@sjorsgielen.nl>
	Date: Mon Aug 31 17:29:00 2015 +0200

	Determine WebSocket URI scheme by looking at the configured client URI instead of looking at current request headers. Refs T9293.

	diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
	index 90325bd..0f04d23 100644
	--- a/src/view/page/PhabricatorStandardPageView.php
	+++ b/src/view/page/PhabricatorStandardPageView.php
	@@ -455,7 +455,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
	$client_uri->setDomain($this_host->getDomain());
	}

	- if ($request->isHTTPS()) {
	+ if ($client_uri->getProtocol() == "https") {
	$client_uri->setProtocol('wss');
	} else {
	$client_uri->setProtocol('ws');

File Metadata

Mime Type: text/x-diff
Storage Engine: amazon-s3
Storage Format: Raw Data
Storage Handle: phabricator/bk/o3/wojqoh3dr6rjh6s2
Default Alt Text: T9293.patch (870 B)

Event Timeline