Merge pull request #25071 from meeseeksmachine/auto-backport-of-pr-25039-on-v3.7.x

QuLogic · web-flow · commit 21f6e50869cc · 2023-01-24T21:08:13.000-05:00
Backport PR #25039 on branch v3.7.x (Updated WebAgg JS to check and send request over wss if using HTTPS)
diff --git a/lib/matplotlib/backends/web_backend/all_figures.html b/lib/matplotlib/backends/web_backend/all_figures.html
@@ -24,7 +24,9 @@
           figure_div.id = "figure-div";
           main_div.appendChild(figure_div);
           var websocket_type = mpl.get_websocket_type();
-          var websocket = new websocket_type("{{ ws_uri }}" + fig_id + "/ws");
+          var uri = "{{ ws_uri }}" + fig_id + "/ws";
+          if (window.location.protocol === "https:") uri = uri.replace('ws:', 'wss:')
+          var websocket = new websocket_type(uri);
           var fig = new mpl.figure(fig_id, websocket, mpl_ondownload, figure_div);
 
           fig.focus_on_mouseover = true;
diff --git a/lib/matplotlib/backends/web_backend/single_figure.html b/lib/matplotlib/backends/web_backend/single_figure.html
@@ -19,8 +19,9 @@
       ready(
         function () {
           var websocket_type = mpl.get_websocket_type();
-          var websocket = new websocket_type(
-              "{{ ws_uri }}" + {{ str(fig_id) }} + "/ws");
+          var uri = "{{ ws_uri }}" + {{ str(fig_id) }} + "/ws";
+          if (window.location.protocol === 'https:') uri = uri.replace('ws:', 'wss:')
+          var websocket = new websocket_type(uri);
           var fig = new mpl.figure(
               {{ str(fig_id) }}, websocket, mpl_ondownload,
               document.getElementById("figure"));
