Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 20:05:19 +00:00
Code Issues Projects Releases Wiki Activity

Revert "bugfix: portbind error when falling back to http server"

Browse Source 
This reverts commit 4817ed9c52.
the bugfix is inappropriate
This commit is contained in:
alangy98 2022-04-25 02:30:45 +08:00 committed by Melledy
parent 4837ccb983
commit 21b3ac103a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
View File

@ -200,6 +200,8 @@ public final class DispatchServer {
public void start() throws Exception { public void start() throws Exception {
HttpServer server; HttpServer server;
if (Grasscutter.getConfig().getDispatchOptions().UseSSL) { 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)) { try (FileInputStream fis = new FileInputStream(Grasscutter.getConfig().getDispatchOptions().KeystorePath)) {
char[] keystorePassword = Grasscutter.getConfig().getDispatchOptions().KeystorePassword.toCharArray(); char[] keystorePassword = Grasscutter.getConfig().getDispatchOptions().KeystorePassword.toCharArray();
KeyManagerFactory _kmf; KeyManagerFactory _kmf;
@ -232,9 +234,9 @@ public final class DispatchServer {
throw originalEx; throw originalEx;
} }
} }
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(_kmf.getKeyManagers(), null, null); sslContext.init(_kmf.getKeyManagers(), null, null);
HttpsServer httpsServer = HttpsServer.create(getAddress(), 0);
httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext)); httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
server = httpsServer; server = httpsServer;
} catch (BindException ignored) { } catch (BindException ignored) {