From c63ae6f11d11ccefbae7d0db8bc99feaa7bbd62a Mon Sep 17 00:00:00 2001 From: Philip Horger Date: Fri, 18 Apr 2014 10:01:42 -0700 Subject: [PATCH] Don't panic on https #2104 --- src/components/net/http_loader.rs | 6 +++++- src/test/html/https.html | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/test/html/https.html diff --git a/src/components/net/http_loader.rs b/src/components/net/http_loader.rs index 1bed5bf2e49..2b632a5d572 100644 --- a/src/components/net/http_loader.rs +++ b/src/components/net/http_loader.rs @@ -52,7 +52,11 @@ fn load(mut url: Url, start_chan: Sender) { redirected_to.insert(url.clone()); - assert!("http" == url.scheme); + if "http" != url.scheme { + info!("{:s} request, but we don't support that scheme", url.scheme); + send_error(url, start_chan); + return; + } info!("requesting {:s}", url.to_str()); diff --git a/src/test/html/https.html b/src/test/html/https.html new file mode 100644 index 00000000000..c461f0c5e3d --- /dev/null +++ b/src/test/html/https.html @@ -0,0 +1,7 @@ + + + + + + +