From d88c8c475b354df934d58ca791ed2e5cb268e72b Mon Sep 17 00:00:00 2001 From: Paul Heijman Date: Thu, 26 Mar 2026 16:30:55 +0100 Subject: [PATCH] Fix Solr URL error messages and update scheme check --- src/args.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/args.rs b/src/args.rs index a663c57..e43ad2c 100644 --- a/src/args.rs +++ b/src/args.rs @@ -450,23 +450,23 @@ fn parse_solr_url(src: &str) -> Result { return Err(format!("Error parsing Solr: {}", reason)); } let parsed = parsing.unwrap(); - if parsed.scheme() != "http" { - return Err("Solr url scheme must be http or https as in: http:://server.domain:8983/solr" + if parsed.scheme() != "http" && parsed.scheme() != "https" { + return Err("Solr url scheme must be http or https as in: http://server.domain:8983/solr" .to_string()); } if parsed.query().is_some() { return Err("Solr url scheme must be a base url without query parameters as in: \ - http:://server.domain:8983/solr" + http://server.domain:8983/solr" .to_string()); } if parsed.path_segments().is_none() { - return Err("Solr url path must be 'api' or 'solr' as in: http:://server.domain:8983/solr" + return Err("Solr url path must be 'api' or 'solr' as in: http://server.domain:8983/solr" .to_string()); } else { let paths = parsed.path_segments(); if paths.iter().count() != 1 { return Err("Solr url path must not include core name as in: \ - http:://server.domain:8983/solr" + http://server.domain:8983/solr" .to_string()); } }