Alexandre Julliard : Don' t specify protocol in URLs in order to support https.

Alexandre Julliard julliard at winehq.org
Sat Jun 1 08:54:02 CDT 2013


Module: tools
Branch: master
Commit: fb2fd21ca6d579f6881168f6e49c0be6ede85dfe
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=fb2fd21ca6d579f6881168f6e49c0be6ede85dfe

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sat Jun  1 11:38:16 2013 +0200

Don't specify protocol in URLs in order to support https.

---

 patches/patches.css                     |    8 ++++----
 patches/update                          |   16 ++++++++--------
 patches/update-regressions              |   16 ++++++++--------
 testbot/lib/WineTestBot/CGI/PageBase.pm |   10 +++++-----
 transl/index.php                        |    2 +-
 winetest/winetest.conf                  |    2 +-
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/patches/patches.css b/patches/patches.css
index 9b2b8ca..f988f11 100644
--- a/patches/patches.css
+++ b/patches/patches.css
@@ -3,7 +3,7 @@
 body {
     background-color: #000000;
     color: #000000;
-    background-image: url("http://winehq.org/images/bg.jpg");
+    background-image: url("//winehq.org/images/bg.jpg");
     background-repeat: no-repeat;
     font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif;
     margin: 0;
@@ -59,7 +59,7 @@ a:hover   { text-decoration: underline; }
 }
 
 #tabs li {
-    background-image: url("http://winehq.org/images/tab_u.png");
+    background-image: url("//winehq.org/images/tab_u.png");
     background-repeat: no-repeat;
     float: left;
     height: 28px;
@@ -70,7 +70,7 @@ a:hover   { text-decoration: underline; }
 }
 
 #tabs li.s {
-    background-image: url("http://winehq.org/images/tab_s.png");
+    background-image: url("//winehq.org/images/tab_s.png");
 }
 
 #tabs li.s a {
@@ -78,7 +78,7 @@ a:hover   { text-decoration: underline; }
 }
 
 #tabs li:hover {
-    background-image: url("http://winehq.org/images/tab_h.png");
+    background-image: url("//winehq.org/images/tab_h.png");
 }
 
 #tabs a {
diff --git a/patches/update b/patches/update
index c716354..baf2a2a 100755
--- a/patches/update
+++ b/patches/update
@@ -52,7 +52,7 @@ my @legend =
  [ "committed",  "<ul><li>You have done everything right; congratulations!</li>" .
                  "<li>You screwed up but AJ missed it, send a fix before someone notices ;-)</li></ul>" ],
  [ "depend",     "<ul><li>The patch is part of a series in which a previous patch hasn't been applied. Resend when the dependent patch is fixed.</li></ul>" ],
- [ "sequence",   "<ul><li>The patch is part of a series but it's not correctly numbered. Resend the series with correct sequence numbers to enable the <a href=\"http://testbot.winehq.org/\">testbot</a> to figure it out.</li></ul>" ],
+ [ "sequence",   "<ul><li>The patch is part of a series but it's not correctly numbered. Resend the series with correct sequence numbers to enable the <a href=\"//testbot.winehq.org/\">testbot</a> to figure it out.</li></ul>" ],
  [ "superseded", "<ul><li>An updated version of the patch has been submitted.</li>" .
                  "<li>Someone else fixed the problem already.</li></ul>" ],
  [ "testcase",   "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ],
@@ -81,7 +81,7 @@ my @legend =
  [ "testfail",   "<ul><li>You didn't run 'make test' before submitting.</li>" .
                  "<li>The patch requires a Wine fix but doesn't use todo_wine.</li>" .
                  "<li>The patch fixes a failure but doesn't remove the corresponding todo_wine.</li>" .
-                 "<li>The <a href=\"http://testbot.winehq.org/\">testbot</a> detected new failures on Windows.</li></ul>" ],
+                 "<li>The <a href=\"//testbot.winehq.org/\">testbot</a> detected new failures on Windows.</li></ul>" ],
 );
 
 my $dir = "$ENV{HOME}/patches";
@@ -101,14 +101,14 @@ print INDEX start_html(-title=>"Patches list",
                        -encoding=>"utf-8",
                        -style=>{src=>"patches.css"});
 
-print INDEX "<div id=\"logo_glass\"><a href=\"/patches/\"><img src=\"http://winehq.org/images/winehq_logo_glass_sm.png\"></a></div>\n";
-print INDEX "<div id=\"logo_text\"><a href=\"/patches/\"><img src=\"http://winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n";
+print INDEX "<div id=\"logo_glass\"><a href=\"/patches/\"><img src=\"//winehq.org/images/winehq_logo_glass_sm.png\"></a></div>\n";
+print INDEX "<div id=\"logo_text\"><a href=\"/patches/\"><img src=\"//winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n";
 print INDEX "<div id=\"tabs\"><ul>",
-    "<li><a href=\"http://www.winehq.org/\">WineHQ</a></li>",
+    "<li><a href=\"//www.winehq.org/\">WineHQ</a></li>",
     "<li><a href=\"http://wiki.winehq.org/\">Wiki</a></li>",
-    "<li><a href=\"http://appdb.winehq.org/\">AppDB</a></li>",
-    "<li><a href=\"http://bugs.winehq.org/\">Bugzilla</a></li>",
-    "<li><a href=\"http://forums.winehq.org/\">Forums</a></li></ul></div>\n";
+    "<li><a href=\"//appdb.winehq.org/\">AppDB</a></li>",
+    "<li><a href=\"//bugs.winehq.org/\">Bugzilla</a></li>",
+    "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n";
 print INDEX "<div id=\"logo_blurb\">Wine source repository – Patch status</div>\n";
 print INDEX "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n";
 print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>",
diff --git a/patches/update-regressions b/patches/update-regressions
index 3bc2fff..f8c98a2 100755
--- a/patches/update-regressions
+++ b/patches/update-regressions
@@ -28,8 +28,8 @@ binmode STDOUT, ':utf8';
 
 $ENV{"GIT_DIR"} = "/home/winehq/opt/source/git/wine.git";
 
-my $bugzilla_base = "http://bugs.winehq.org/show_bug.cgi?id=";
-my $gitweb_base = "http://source.winehq.org/git/wine.git/commit/";
+my $bugzilla_base = "//bugs.winehq.org/show_bug.cgi?id=";
+my $gitweb_base = "//source.winehq.org/git/wine.git/commit/";
 my $dest = "/home/winehq/opt/source";
 
 my %regressions;
@@ -122,14 +122,14 @@ print OUTPUT start_html(-title=>"Regressions",
                        -style=>{src=>"patches/patches.css"},
                        -script=>$js);
 
-print OUTPUT "<div id=\"logo_glass\"><a href=\"/regressions\"><img src=\"http://winehq.org/images/winehq_logo_glass_sm.png\"></a></div>\n";
-print OUTPUT "<div id=\"logo_text\"><a href=\"/regressions\"><img src=\"http://winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n";
+print OUTPUT "<div id=\"logo_glass\"><a href=\"/regressions\"><img src=\"//winehq.org/images/winehq_logo_glass_sm.png\"></a></div>\n";
+print OUTPUT "<div id=\"logo_text\"><a href=\"/regressions\"><img src=\"//winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n";
 print OUTPUT "<div id=\"tabs\"><ul>",
-    "<li><a href=\"http://www.winehq.org/\">WineHQ</a></li>",
+    "<li><a href=\"//www.winehq.org/\">WineHQ</a></li>",
     "<li><a href=\"http://wiki.winehq.org/\">Wiki</a></li>",
-    "<li><a href=\"http://appdb.winehq.org/\">AppDB</a></li>",
-    "<li><a href=\"http://bugs.winehq.org/\">Bugzilla</a></li>",
-    "<li><a href=\"http://forums.winehq.org/\">Forums</a></li></ul></div>\n";
+    "<li><a href=\"//appdb.winehq.org/\">AppDB</a></li>",
+    "<li><a href=\"//bugs.winehq.org/\">Bugzilla</a></li>",
+    "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n";
 print OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions</div>\n";
 
 print OUTPUT "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n";
diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm
index 5439ebf..7e12e80 100644
--- a/testbot/lib/WineTestBot/CGI/PageBase.pm
+++ b/testbot/lib/WineTestBot/CGI/PageBase.pm
@@ -239,12 +239,12 @@ ${ProjectName} Test Bot
 
 <div id='tabs'>
   <ul>
-    <li><a href='http://www.winehq.org/'>WineHQ</a></li>
+    <li><a href='//www.winehq.org/'>WineHQ</a></li>
     <li><a href='http://wiki.winehq.org'>Wiki</a></li>
-    <li><a href='http://appdb.winehq.org/'>AppDB</a></li>
-    <li><a href='http://bugs.winehq.org/'>Bugzilla</a></li>
-    <li class='s'><a href='http://${WebHostName}/'>TestBot</a></li>
-    <li><a href='http://forums.winehq.org/'>Forums</a></li>
+    <li><a href='//appdb.winehq.org/'>AppDB</a></li>
+    <li><a href='//bugs.winehq.org/'>Bugzilla</a></li>
+    <li class='s'><a href='//${WebHostName}/'>TestBot</a></li>
+    <li><a href='//forum.winehq.org/'>Forums</a></li>
   </ul>
 </div>
 
diff --git a/transl/index.php b/transl/index.php
index ca21ff7..abf55a6 100644
--- a/transl/index.php
+++ b/transl/index.php
@@ -38,7 +38,7 @@ while ($line = fgets($summary, 1024))
 <h1>Translation statistics for <?php echo $version[0] ?></h1>
 <div class="contents">
 
-<p>This page shows the state of the translations of <a href="http://www.winehq.org/">Wine</a>.
+<p>This page shows the state of the translations of <a href="//www.winehq.org/">Wine</a>.
 Note that some resources marked as translated may in fact still be English. Sometimes developers
 add new English resources into every language file. This automatic tool has a 'Pedantic' mode that
 detects most of these but currently has a lot of false positives. If you would like to read about
diff --git a/winetest/winetest.conf b/winetest/winetest.conf
index 3231d06..19104d8 100644
--- a/winetest/winetest.conf
+++ b/winetest/winetest.conf
@@ -6,7 +6,7 @@ $queuedir = "$root/queue";
 $datadir  = "$root/data";
 
 $gitdir = "/home/winehq/opt/source/git/wine.git";
-$gitweb = "http://source.winehq.org/git/wine.git";
+$gitweb = "//source.winehq.org/git/wine.git";
 
 # Maximum number of reports for one version and tag
 $maxmult = 10;




More information about the wine-cvs mailing list