From 21b3ac103afbe32e602cd3a45bdc0c4dc4fdfe05 Mon Sep 17 00:00:00 2001 From: alangy98 <56515358+alangy98@users.noreply.github.com> Date: Mon, 25 Apr 2022 02:30:45 +0800 Subject: [PATCH] Revert "bugfix: portbind error when falling back to http server" This reverts commit 4817ed9c5266de2d589ce998bec04d1b03e88a34. the bugfix is inappropriate --- .../emu/grasscutter/server/dispatch/DispatchServer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java index f681baa60..6d8a06e7c 100644 --- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java +++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java @@ -200,6 +200,8 @@ public final class DispatchServer { public void start() throws Exception { HttpServer server; if (Grasscutter.getConfig().getDispatchOptions().UseSSL) { + HttpsServer httpsServer = HttpsServer.create(getAddress(), 0); + SSLContext sslContext = SSLContext.getInstance("TLS"); try (FileInputStream fis = new FileInputStream(Grasscutter.getConfig().getDispatchOptions().KeystorePath)) { char[] keystorePassword = Grasscutter.getConfig().getDispatchOptions().KeystorePassword.toCharArray(); KeyManagerFactory _kmf; @@ -232,9 +234,9 @@ public final class DispatchServer { throw originalEx; } } - SSLContext sslContext = SSLContext.getInstance("TLS"); + sslContext.init(_kmf.getKeyManagers(), null, null); - HttpsServer httpsServer = HttpsServer.create(getAddress(), 0); + httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext)); server = httpsServer; } catch (BindException ignored) {