Use https:// for ardupilot.org URLs

ArduPilot domains are now https://

README.md

@@ -21,7 +21,7 @@ http://planner2.ardupilot.com/credits-and-contributors/
 
 Documentation
 =============
-see http://ardupilot.org/planner2/
+see https://ardupilot.org/planner2/
 
 Mac OS X
 ========

apm_planner.pro

@@ -1,6 +1,6 @@
 # -------------------------------------------------
 # APM Planner - Micro Air Vehicle Groundstation
-# Please see our website at <http://ardupilot.org>
+# Please see our website at <https://ardupilot.org>
 # Maintainer:
 # Bill Bonney <[email protected]>
 # Based of QGroundControl by Lorenz Meier <[email protected]>

apm_planner_version.json

@@ -5,7 +5,7 @@
         {
             "platform": "osx",
             "type": "stable",
-            "url": "http://firmware.ardupilot.org/Tools/APMPlanner/apm_planner_2.0.24_osx.dmg",
+            "url": "https://firmware.ardupilot.org/Tools/APMPlanner/apm_planner_2.0.24_osx.dmg",
             "name" : "apm_planner_2.0.24_osx.dmg",
             "version" : "2.0.24",
             "sha" : "",
@@ -14,7 +14,7 @@
         {
             "platform": "win",
             "type": "stable",
-            "url": "http://firmware.ardupilot.org/Tools/APMPlanner/apm_planner_2.0.24_win.exe",
+            "url": "https://firmware.ardupilot.org/Tools/APMPlanner/apm_planner_2.0.24_win.exe",
             "name" : "apm_planner_2.0.24_win.exe",
             "version": "2.0.24",
             "sha" : "",
@@ -23,7 +23,7 @@
         {
             "platform": "ubuntu_trusty",
             "type": "stable",
-            "url": "http://firmware.ardupilot.org/Tools/APMPlanner/archive/apm_planner_2.0.18_ubuntu_trusty.deb",
+            "url": "https://firmware.ardupilot.org/Tools/APMPlanner/archive/apm_planner_2.0.18_ubuntu_trusty.deb",
             "name" : "apm_planner_2.0.18_ubuntu_trusty.deb",
             "version": "2.0.18",
             "sha" : "",
@@ -32,7 +32,7 @@
         {
             "platform": "ubuntu_trusty64",
             "type": "stable",
-            "url": "http://firmware.ardupilot.org/Tools/APMPlanner/archive/apm_planner_2.0.18_ubuntu_trusty64.deb",
+            "url": "https://firmware.ardupilot.org/Tools/APMPlanner/archive/apm_planner_2.0.18_ubuntu_trusty64.deb",
             "name" : "apm_planner_2.0.18_ubuntu_trusty64.deb",
             "version": "2.0.18",
             "sha" : "",
@@ -41,7 +41,7 @@
         {
             "platform": "osx",
             "type": "beta",
-            "url": "http://firmware.ardupilot.org/Tools/APMPlanner/beta/apm_planner_2.0.24_osx.dmg",
+            "url": "https://firmware.ardupilot.org/Tools/APMPlanner/beta/apm_planner_2.0.24_osx.dmg",
             "name" : "apm_planner_2.0.24_osx.dmg",
             "version" : "2.0.24",
             "sha" : "",
@@ -50,7 +50,7 @@
         {
             "platform": "win",
             "type": "beta",
-            "url": "http://firmware.ardupilot.org/Tools/APMPlanner/beta/apm_planner_2.0.24_win.exe",
+            "url": "https://firmware.ardupilot.org/Tools/APMPlanner/beta/apm_planner_2.0.24_win.exe",
             "name" : "apm_planner_2.0.24_win.exe",
             "version": "2.0.24",
             "sha" : "",
@@ -59,7 +59,7 @@
         {
             "platform": "ubuntu_trusty",
             "type": "beta",
-            "url": "http://firmware.ardupilot.org/Tools/APMPlanner/beta/archived/apm_planner_2.0.19-rc4_ubuntu_trusty.deb",
+            "url": "https://firmware.ardupilot.org/Tools/APMPlanner/beta/archived/apm_planner_2.0.19-rc4_ubuntu_trusty.deb",
             "name" : "apm_planner_2.0.19-rc4_ubuntu_trusty.deb",
             "version": "2.0.19-rc4",
             "sha" : "",
@@ -68,7 +68,7 @@
         {
             "platform": "ubuntu_trusty64",
             "type": "beta",
-            "url": "http://firmware.ardupilot.org/Tools/APMPlanner/beta/archived/apm_planner_2.0.19-rc4_ubuntu_trusty64.deb",
+            "url": "https://firmware.ardupilot.org/Tools/APMPlanner/beta/archived/apm_planner_2.0.19-rc4_ubuntu_trusty64.deb",
             "name" : "apm_planner_2.0.19-rc4_ubuntu_trusty64.deb",
             "version": "2.0.19-rc4",
             "sha" : "",

docker/2.0.20-wily64/Dockerfile

@@ -8,7 +8,7 @@
 FROM ubuntu:15.10
 MAINTAINER Rik Bruggink <[email protected]>, Eduardo Feo <[email protected]>
 RUN apt-get -y update && apt-get -y upgrade && apt-get -y install wget
-RUN wget http://firmware.ardupilot.org/Tools/APMPlanner/archive/apm_planner_2.0.20_ubuntu_wily64.deb
+RUN wget https://firmware.ardupilot.org/Tools/APMPlanner/archive/apm_planner_2.0.20_ubuntu_wily64.deb
 RUN dpkg -i apm_planner_2.0.20_ubuntu_wily64.deb; exit 0
 RUN apt-get -f -y install
 RUN rm -rf /var/lib/apt/lists/*

docker/2.0.24-xenial64/Dockerfile

@@ -8,7 +8,7 @@
 FROM ubuntu:xenial
 MAINTAINER Rik Bruggink <[email protected]>, Eduardo Feo <[email protected]>
 RUN apt-get -y update && apt-get -y upgrade && apt-get -y install wget
-RUN wget http://firmware.eu.ardupilot.org/Tools/APMPlanner/apm_planner_2.0.24_xenial64.deb
+RUN wget https://firmware.ardupilot.org/Tools/APMPlanner/apm_planner_2.0.24_xenial64.deb
 RUN dpkg -i apm_planner_2.0.24_xenial64.deb; exit 0
 RUN apt-get -f -y install
 RUN rm -rf /var/lib/apt/lists/*

src/ui/AboutDialog.ui

@@ -63,7 +63,7 @@
       <item>
        <widget class="QLabel" name="linkLabel">
         <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;info:&lt;a href=&quot;http://planner2.ardupilot.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;planner2.ardupilot.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;info:&lt;a href=&quot;https://planner2.ardupilot.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;planner2.ardupilot.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
@@ -73,7 +73,7 @@
       <item>
        <widget class="QLabel" name="linkLabel_2">
         <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;credits:&lt;a href=&quot;http://planner2.ardupilot.org/docs/credits-and-contributors.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://planner2.ardupilot.org/docs/cr...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;credits:&lt;a href=&quot;https://planner2.ardupilot.org/docs/credits-and-contributors.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://planner2.ardupilot.org/docs/cr...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>

src/ui/AutoUpdateCheck.h

@@ -33,7 +33,7 @@ This file is part of the APM_PLANNER project
 #include <QObject>
 #include <QtNetwork>
 
-const QString AUTOUPDATE_VERSION_OBJECT_LOCATION = "http://firmware.ardupilot.org/Tools/APMPlanner/";
+const QString AUTOUPDATE_VERSION_OBJECT_LOCATION = "https://firmware.ardupilot.org/Tools/APMPlanner/";
 const QString AUTOUPDATE_VERSION_OBJECT_NAME = "apm_planner_version.json";
 
 class AutoUpdateCheck : public QObject

src/ui/configuration/ApmFirmwareConfig.cc

@@ -35,7 +35,7 @@ This file is part of the APM_PLANNER project
 
 static const QString DEFAULT_FIRMWARE_TYPE = "stable";
 static const QString DEFAULT_AUTOPILOT_HW_TYPE = "";
-static const QString DEFAULT_ARDUPILOT_FW_URL = "http://firmware.ardupilot.org";
+static const QString DEFAULT_ARDUPILOT_FW_URL = "https://firmware.ardupilot.org";
 
 ApmFirmwareConfig::ApmFirmwareConfig(QWidget *parent) : AP2ConfigWidget(parent),
     m_throwPropSpinWarning(false),
@@ -484,10 +484,10 @@ void ApmFirmwareConfig::requestFirmwares(QString type, QString autopilot, bool n
         ui.warningLabelAC33->show();
         /*
          * AC3.3 only supports Pixhawk, APM1/APM2 is discontinued.
-         * Last known 'latest': http://firmware.ardupilot.org/Copter/2015-03/2015-03-13-00:03/
+         * Last known 'latest': https://firmware.ardupilot.org/Copter/2015-03/2015-03-13-00:03/
          * stable and beta both still support, as they are not 3.3 yet
          */
-        QString prepath = "http://firmware.ardupilot.org/Copter/stable-3.4.6/" + prestring;
+        QString prepath = "https://firmware.ardupilot.org/Copter/stable-3.4.6/" + prestring;
         m_buttonToUrlMap[ui.copterPushButton] = prepath + "-heli/ArduCopter.hex";
         m_buttonToUrlMap[ui.hexaPushButton] = prepath + "-hexa/ArduCopter.hex";
         m_buttonToUrlMap[ui.octaQuadPushButton] = prepath + "-octa-quad/ArduCopter.hex";
@@ -834,7 +834,7 @@ void ApmFirmwareConfig::flashButtonClicked()
 
         QLOG_DEBUG() << "Go download:" << m_buttonToUrlMap[senderbtn];
         QNetworkReply *reply = m_networkManager->get(QNetworkRequest(QUrl(m_buttonToUrlMap[senderbtn])));
-        //http://firmware.ardupilot.org/Plane/stable/apm2/ArduPlane.hex
+        //https://firmware.ardupilot.org/Plane/stable/apm2/ArduPlane.hex
         ui.textBrowser->append("Started downloading " + m_buttonToUrlMap[senderbtn]);
         connect(reply,SIGNAL(finished()),this,SLOT(downloadFinished()));
         connect(reply,SIGNAL(error(QNetworkReply::NetworkError)),this,SLOT(firmwareListError(QNetworkReply::NetworkError)));

src/ui/configuration/ApmSoftwareConfig.cc

@@ -113,7 +113,7 @@ ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent),
     pdef_vehicle_dirs.append(QPair<QString,QString>(QString("APMrover2"),
                                    QString("ardurover.pdef.xml")));
 
-    const QString param_basepath = "http://autotest.ardupilot.org/Parameters";
+    const QString param_basepath = "https://autotest.ardupilot.org/Parameters";
     for (QList<QPair<QString,QString> >::iterator i=pdef_vehicle_dirs.begin(); i != pdef_vehicle_dirs.end(); i++)
     {
         QPair<QString, QString> pdef_info = *i;