From 2ec32a5775512bcdb56ab2784c6fc798d995c91c Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Fri, 16 Oct 2026 17:49:40 +0100
Subject: [PATCH] Fix all connections trying to use HTTPS/TLS

Accidentally introduced in f0cfd0929b0e1f7b3a2a5d3695c804328b3ed7b5:
we're using the global SSL context, not the one from the connection
info.
---
 .../core/apis/http/NetworkUtils.java          | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/projects/core/src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java b/projects/core/src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java
index 3daecbda8..f6a382494 100644
--- a/projects/core/src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java
+++ b/projects/core/src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java
@@ -4,6 +4,7 @@
 
 package dan200.computercraft.core.apis.http;
 
+import com.google.common.base.Suppliers;
 import dan200.computercraft.core.apis.http.options.Action;
 import dan200.computercraft.core.apis.http.options.AddressRule;
 import dan200.computercraft.core.apis.http.options.Options;
@@ -42,6 +43,7 @@ import java.net.Inet6Address;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 /**
  * Just a shared object for executing simple HTTP related tasks.
@@ -62,27 +64,17 @@ public final class NetworkUtils {
         );
     }
 
-    private static final Object sslLock = new Object();
-    private static @Nullable SslContext sslContext;
-    private static boolean triedSslContext = false;
-
-    private static @Nullable SslContext makeSslContext() {
-        if (triedSslContext) return sslContext;
-        synchronized (sslLock) {
-            if (triedSslContext) return sslContext;
-
-            triedSslContext = true;
-            try {
-                return sslContext = SslContextBuilder.forClient().build();
-            } catch (SSLException e) {
-                LOG.error("Cannot construct SSL context", e);
-                return sslContext = null;
-            }
+    private static final Supplier<SslContext> sslContext = Suppliers.memoize(() -> {
+        try {
+            return SslContextBuilder.forClient().build();
+        } catch (SSLException e) {
+            LOG.error("Cannot construct SSL context", e);
+            return null;
         }
-    }
+    });
 
     private static SslContext getSslContext() throws HTTPRequestException {
-        var ssl = makeSslContext();
+        var ssl = sslContext.get();
         if (ssl == null) throw new HTTPRequestException("Could not create a secure connection");
         return ssl;
     }
@@ -253,8 +245,8 @@ public final class NetworkUtils {
 
         if (conn.proxy() != null) conn.proxy().accept(ch);
 
-        if (sslContext != null) {
-            p.addLast(makeSslHandler(ch, sslContext, conn.timeout(), conn.uri().getHost(), conn.address().getPort()));
+        if (conn.sslContext() != null) {
+            p.addLast(makeSslHandler(ch, conn.sslContext(), conn.timeout(), conn.uri().getHost(), conn.address().getPort()));
         }
     }