Skip to content

Commit 6980ef9

Browse files
committed
fix libsql-wal https connector
1 parent 0bd768c commit 6980ef9

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

libsql-server/src/lib.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pub struct Server<C = HttpConnector, A = AddrIncoming, D = HttpsConnector<HttpCo
169169
pub shutdown_timeout: std::time::Duration,
170170
pub use_custom_wal: Option<CustomWAL>,
171171
pub storage_server_address: String,
172-
pub connector: Option<C>,
172+
pub connector: Option<D>,
173173
}
174174

175175
impl<C, A, D> Default for Server<C, A, D> {
@@ -821,13 +821,7 @@ where
821821

822822
let config = aws_config::load_defaults(BehaviorVersion::latest()).await;
823823

824-
let https_connector = hyper_rustls::HttpsConnectorBuilder::new()
825-
.with_native_roots()
826-
.https_or_http()
827-
.enable_all_versions()
828-
.wrap_connector(self.connector.clone().unwrap());
829-
830-
let http_client = HyperClientBuilder::new().build(https_connector);
824+
let http_client = HyperClientBuilder::new().build(self.connector.clone().unwrap());
831825
let mut builder = config.into_builder();
832826
builder.set_http_client(Some(http_client));
833827
builder.set_endpoint_url(opt.aws_endpoint.clone());

libsql-server/src/main.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,16 @@ async fn build_server(config: &Cli) -> anyhow::Result<Server> {
627627
}
628628
});
629629

630+
let mut http = HttpConnector::new();
631+
http.enforce_http(false);
632+
http.set_nodelay(true);
633+
634+
let https = hyper_rustls::HttpsConnectorBuilder::new()
635+
.with_native_roots()
636+
.https_or_http()
637+
.enable_all_versions()
638+
.wrap_connector(http);
639+
630640
Ok(Server {
631641
path: config.db_path.clone().into(),
632642
db_config,
@@ -651,7 +661,7 @@ async fn build_server(config: &Cli) -> anyhow::Result<Server> {
651661
.unwrap_or(Duration::from_secs(30)),
652662
use_custom_wal: config.use_custom_wal,
653663
storage_server_address: config.storage_server_address.clone(),
654-
connector: Some(HttpConnector::new()),
664+
connector: Some(https),
655665
})
656666
}
657667

0 commit comments

Comments
 (0)