cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmue...@apache.org
Subject weinre commit: update for release 2.0.0-pre-I0Z7U9OV
Date Tue, 07 Oct 2014 15:46:32 GMT
Repository: cordova-weinre
Updated Branches:
  refs/heads/master 6c1543bc6 -> 891a61f73


update for release 2.0.0-pre-I0Z7U9OV

* fix for https://issues.apache.org/jira/browse/CB-5718
          Detection of HTTPS broken


Project: http://git-wip-us.apache.org/repos/asf/cordova-weinre/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-weinre/commit/891a61f7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-weinre/tree/891a61f7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-weinre/diff/891a61f7

Branch: refs/heads/master
Commit: 891a61f73f27c171f5170327c18858ccf48841d2
Parents: 6c1543b
Author: Patrick Mueller <pmuellr@apache.org>
Authored: Tue Oct 7 11:43:38 2014 -0400
Committer: Patrick Mueller <pmuellr@apache.org>
Committed: Tue Oct 7 11:43:38 2014 -0400

----------------------------------------------------------------------
 weinre.doc/ChangeLog.body.html | 1 +
 weinre.web/index.js            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/891a61f7/weinre.doc/ChangeLog.body.html
----------------------------------------------------------------------
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>
 
 <!-- ======================================================================= -->

http://git-wip-us.apache.org/repos/asf/cordova-weinre/blob/891a61f7/weinre.web/index.js
----------------------------------------------------------------------
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 @@ function buildHttpURL(uri) {
         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


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message