mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
auto merge of #5212 : Manishearth/servo/ssl-off, r=larsbergstrom
SSL is broken-ish (eg tw.yahoo.com, html.spec.whatwg.org don't work since we don't verify SAN properly), this flag can let devs bypass the protection for testing purposes.
This commit is contained in:
commit
389338c28f
2 changed files with 13 additions and 1 deletions
|
@ -23,6 +23,7 @@ use std::sync::mpsc::{Sender, channel};
|
|||
use std::thunk::Invoke;
|
||||
use util::task::spawn_named;
|
||||
use util::resource_files::resources_dir_path;
|
||||
use util::opts;
|
||||
use url::{Url, UrlParser};
|
||||
|
||||
use std::borrow::ToOwned;
|
||||
|
@ -89,7 +90,12 @@ fn load(mut load_data: LoadData, start_chan: Sender<TargetedLoadResponse>, cooki
|
|||
function: \"SSL3_GET_SERVER_CERTIFICATE\", \
|
||||
reason: \"certificate verify failed\" }]";
|
||||
|
||||
let mut connector = HttpConnector(Some(box verifier as Box<FnMut(&mut SslContext)>));
|
||||
let mut connector = if opts::get().nossl {
|
||||
HttpConnector(None)
|
||||
} else {
|
||||
HttpConnector(Some(box verifier as Box<FnMut(&mut SslContext)>))
|
||||
};
|
||||
|
||||
let mut req = match Request::with_connector(load_data.method.clone(), url.clone(), &mut connector) {
|
||||
Ok(req) => req,
|
||||
Err(HttpError::HttpIoError(IoError {kind: IoErrorKind::OtherIoError,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue