update for release 2.0.0-pre-I0Z7U9OV
* fix for https://issues.apache.org/jira/browse/CB-5718
Detection of HTTPS broken
diff --git a/weinre.doc/ChangeLog.body.html b/weinre.doc/ChangeLog.body.html
index f0499e9..8f97c31 100644
--- a/weinre.doc/ChangeLog.body.html
+++ b/weinre.doc/ChangeLog.body.html
@@ -63,6 +63,7 @@
<li><a href="https://issues.apache.org/jira/browse/CB-7430">CB-7430</a> - weinre does not play nice with npm dedupe
<li><a href="https://issues.apache.org/jira/browse/CB-7437">CB-7437</a> - xhr readystate event passed bad event on some platforms
<li><a href="https://issues.apache.org/jira/browse/CB-7438">CB-7438</a> - weinre target not setting server url when from script's src attribute for https
+<li><a href="https://issues.apache.org/jira/browse/CB-5718">CB-5718</a> - Detection of HTTPS broken
</ul>
<!-- ======================================================================= -->
diff --git a/weinre.web/index.js b/weinre.web/index.js
index f30a689..08d7153 100644
--- a/weinre.web/index.js
+++ b/weinre.web/index.js
@@ -67,7 +67,7 @@
return weinre_protocol + "//" + weinre_host + port + pathname + uri
}
- else if (protocol == "https:") {
+ else if (weinre_protocol == "https:") {
if (port != "") port = ":" + port
return weinre_protocol + "//" + weinre_host + port + pathname + uri
