aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-05-14 08:21:17 -0400
committerGitHub <noreply@github.com>2019-05-14 08:21:17 -0400
commit3f30720bbafc504f286beed0cb195dbd1bf6a2e4 (patch)
tree193d3d003e0847cd4cc1bd29d7b78f6b36ff024e
parent3ca9d143afdaab0986c1fa87df546224b6cce5be (diff)
parent71fdba13bec8dbf0e8cf976474b5a8c9fbbb9001 (diff)
downloadservo-3f30720bbafc504f286beed0cb195dbd1bf6a2e4.tar.gz
servo-3f30720bbafc504f286beed0cb195dbd1bf6a2e4.zip
Auto merge of #23363 - Darkspirit:https, r=jdm
More https * Disabled unused legacy TLS. It will be disabled for Nightly 72 or 73 in 5-7 months and ride the [trains](https://wiki.mozilla.org/Release_Management/Calendar). https://blog.mozilla.org/security/2018/10/15/removing-old-versions-of-tls/ * Updated MPL license in a few files. It would be nice if a new version of https://pypi.org/project/servo_tidy/ could be released to update WebRender as well. * Switched servo-deps.s3.amazonaws.com back to https. This was recently regressed by 10585be25c334bd15710d1a6d93391a9acb6d543 and fc28073dfba05cb2d3fda624c135b2125c1b90af. * Made https the default protocol for address bar on desktop. Press Ctrl+L on the Glutin port and enter `example.com`: Servo previously assumed you meant `http://example.com/`, now it is `https://example.com/`. --- - [x] `./mach build --release` does not report any errors - [x] `./mach test-tidy` does not report any errors <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23363) <!-- Reviewable:end -->
-rw-r--r--.travis.yml2
-rw-r--r--components/net/connector.rs9
-rw-r--r--components/script/dom/bindings/codegen/parser/WebIDL.py2
-rw-r--r--components/script/dom/bindings/codegen/parser/tests/test_lenientSetter.py2
-rw-r--r--components/script/dom/bindings/codegen/parser/tests/test_replaceable.py2
-rw-r--r--components/script/dom/navigationpreloadmanager.rs2
-rw-r--r--components/script/dom/offscreencanvas.rs2
-rw-r--r--components/script/dom/offscreencanvasrenderingcontext2d.rs2
-rw-r--r--components/script/dom/webidls/NavigationPreloadManager.webidl2
-rw-r--r--components/script/dom/webidls/OffscreenCanvas.webidl2
-rw-r--r--components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl2
-rw-r--r--components/style/gecko/boxed_types.rs2
-rw-r--r--components/to_shmem_derive/to_shmem.rs2
-rw-r--r--ports/glutin/browser.rs2
-rw-r--r--support/linux/gstreamer/gstreamer.sh2
15 files changed, 21 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index b10ffc75bb5..d550610a1e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
- sudo apt-get update -q
- sudo apt-get install clang-3.9 llvm-3.9-dev llvm-3.9-runtime libunwind8-dev -y
- pip install virtualenv
- - curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
+ - curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
- sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc
- export PKG_CONFIG_PATH=$PWD/gst/lib/pkgconfig
- export GST_PLUGIN_SYSTEM_PATH=$PWD/gst/lib/gstreamer-1.0
diff --git a/components/net/connector.rs b/components/net/connector.rs
index 1306c2d5609..45eda71bd6e 100644
--- a/components/net/connector.rs
+++ b/components/net/connector.rs
@@ -77,8 +77,13 @@ pub fn create_ssl_connector_builder(certs: &str) -> SslConnectorBuilder {
ssl_connector_builder
.set_cipher_list(DEFAULT_CIPHERS)
.expect("could not set ciphers");
- ssl_connector_builder
- .set_options(SslOptions::NO_SSLV2 | SslOptions::NO_SSLV3 | SslOptions::NO_COMPRESSION);
+ ssl_connector_builder.set_options(
+ SslOptions::NO_SSLV2 |
+ SslOptions::NO_SSLV3 |
+ SslOptions::NO_TLSV1 |
+ SslOptions::NO_TLSV1_1 |
+ SslOptions::NO_COMPRESSION,
+ );
ssl_connector_builder
}
diff --git a/components/script/dom/bindings/codegen/parser/WebIDL.py b/components/script/dom/bindings/codegen/parser/WebIDL.py
index 5879f8b0064..31692bd1a2e 100644
--- a/components/script/dom/bindings/codegen/parser/WebIDL.py
+++ b/components/script/dom/bindings/codegen/parser/WebIDL.py
@@ -1,6 +1,6 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
""" A WebIDL parser. """
diff --git a/components/script/dom/bindings/codegen/parser/tests/test_lenientSetter.py b/components/script/dom/bindings/codegen/parser/tests/test_lenientSetter.py
index 78a9ffe9eaa..50e9df658e9 100644
--- a/components/script/dom/bindings/codegen/parser/tests/test_lenientSetter.py
+++ b/components/script/dom/bindings/codegen/parser/tests/test_lenientSetter.py
@@ -1,6 +1,6 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
def should_throw(parser, harness, message, code):
parser = parser.reset();
diff --git a/components/script/dom/bindings/codegen/parser/tests/test_replaceable.py b/components/script/dom/bindings/codegen/parser/tests/test_replaceable.py
index 93ee42ed919..78b1bf7e60b 100644
--- a/components/script/dom/bindings/codegen/parser/tests/test_replaceable.py
+++ b/components/script/dom/bindings/codegen/parser/tests/test_replaceable.py
@@ -1,6 +1,6 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
def should_throw(parser, harness, message, code):
parser = parser.reset();
diff --git a/components/script/dom/navigationpreloadmanager.rs b/components/script/dom/navigationpreloadmanager.rs
index a1e3c9de923..e0d1d6e6c59 100644
--- a/components/script/dom/navigationpreloadmanager.rs
+++ b/components/script/dom/navigationpreloadmanager.rs
@@ -1,6 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use crate::compartments::{AlreadyInCompartment, InCompartment};
use crate::dom::bindings::codegen::Bindings::NavigationPreloadManagerBinding::NavigationPreloadState;
diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs
index 93c836be5ae..bc1e6fb6fac 100644
--- a/components/script/dom/offscreencanvas.rs
+++ b/components/script/dom/offscreencanvas.rs
@@ -1,6 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::OffscreenCanvasBinding::{
diff --git a/components/script/dom/offscreencanvasrenderingcontext2d.rs b/components/script/dom/offscreencanvasrenderingcontext2d.rs
index 8dc4c3063a7..5e2050635b5 100644
--- a/components/script/dom/offscreencanvasrenderingcontext2d.rs
+++ b/components/script/dom/offscreencanvasrenderingcontext2d.rs
@@ -1,6 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::OffscreenCanvasRenderingContext2DBinding;
diff --git a/components/script/dom/webidls/NavigationPreloadManager.webidl b/components/script/dom/webidls/NavigationPreloadManager.webidl
index 23988251fb1..ba8d329769e 100644
--- a/components/script/dom/webidls/NavigationPreloadManager.webidl
+++ b/components/script/dom/webidls/NavigationPreloadManager.webidl
@@ -1,6 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
// https://w3c.github.io/ServiceWorker/#navigation-preload-manager
[Pref="dom.serviceworker.enabled", SecureContext, Exposed=(Window,Worker)]
diff --git a/components/script/dom/webidls/OffscreenCanvas.webidl b/components/script/dom/webidls/OffscreenCanvas.webidl
index 032caa10a0f..d25e8eadd98 100644
--- a/components/script/dom/webidls/OffscreenCanvas.webidl
+++ b/components/script/dom/webidls/OffscreenCanvas.webidl
@@ -1,6 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
// https://html.spec.whatwg.org/multipage/#the-offscreencanvas-interface
typedef (OffscreenCanvasRenderingContext2D or WebGLRenderingContext or WebGL2RenderingContext)
diff --git a/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl b/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl
index ef1d494e73e..aa5b50a6a47 100644
--- a/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl
+++ b/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl
@@ -1,6 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
// https://html.spec.whatwg.org/multipage/#the-offscreen-2d-rendering-context
[Exposed=(Window,Worker), Pref="dom.offscreen_canvas.enabled"]
diff --git a/components/style/gecko/boxed_types.rs b/components/style/gecko/boxed_types.rs
index 857f99e1489..b61c7708b2a 100644
--- a/components/style/gecko/boxed_types.rs
+++ b/components/style/gecko/boxed_types.rs
@@ -1,6 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
//! FFI implementations for types listed in ServoBoxedTypeList.h.
diff --git a/components/to_shmem_derive/to_shmem.rs b/components/to_shmem_derive/to_shmem.rs
index e7ff8c29b8c..01ba308e308 100644
--- a/components/to_shmem_derive/to_shmem.rs
+++ b/components/to_shmem_derive/to_shmem.rs
@@ -1,6 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use derive_common::cg;
use proc_macro2::TokenStream;
diff --git a/ports/glutin/browser.rs b/ports/glutin/browser.rs
index e12d283fc4e..e2f7d397919 100644
--- a/ports/glutin/browser.rs
+++ b/ports/glutin/browser.rs
@@ -491,7 +491,7 @@ fn sanitize_url(request: &str) -> Option<ServoUrl> {
.ok()
.or_else(|| {
if request.contains('/') || is_reg_domain(request) {
- ServoUrl::parse(&format!("http://{}", request)).ok()
+ ServoUrl::parse(&format!("https://{}", request)).ok()
} else {
None
}
diff --git a/support/linux/gstreamer/gstreamer.sh b/support/linux/gstreamer/gstreamer.sh
index cd42b031847..07f3acd3f3e 100644
--- a/support/linux/gstreamer/gstreamer.sh
+++ b/support/linux/gstreamer/gstreamer.sh
@@ -6,5 +6,5 @@
set -o errexit
-curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
+curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc