This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new cbf723319 remove stale ssl-config references (#1370)
cbf723319 is described below
commit cbf723319ab388ec857864b16fe4a8865b8a74f6
Author: PJ Fanning <[email protected]>
AuthorDate: Fri Oct 23 17:25:10 2026 +0100
remove stale ssl-config references (#1370)
Motivation:
Pekko HTTP no longer depends on Lightbend ssl-config, but a few comments,
a test name and the HTTPS docs still referred to it.
Modification:
- Http.defaultClientHttpsContext scaladoc: describe the
SSLContext.getDefault
default instead of ssl-config configuration.
- server-https-support.md: drop the recommendation of the ssl-config
certificate generation guide.
- Rename the ClientServerSpec test that mentioned SSLConfigSettings and
update comments in HttpAPIsTest.
Result:
Docs and comments no longer point users at ssl-config.
Tests:
- Not run - docs, comments and a test name only
- sbt http-core/Test/compile http-tests/Test/compile: pass
- sbt http-tests/Test/javafmtCheck (JDK 17): pass
- sbt docs/paradox: pass
- scalafmt --mode diff-ref=upstream/main: no changes
References:
None - follow-up to the ssl-config removal; akka/akka-http#4278 and #4303
removed it there
---
docs/src/main/paradox/server-side/server-https-support.md | 3 ---
http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala | 3 ++-
.../test/scala/org/apache/pekko/http/scaladsl/ClientServerSpec.scala | 2 +-
.../src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java | 5 +++--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/docs/src/main/paradox/server-side/server-https-support.md
b/docs/src/main/paradox/server-side/server-https-support.md
index ce74a210a..a46f35b1c 100644
--- a/docs/src/main/paradox/server-side/server-https-support.md
+++ b/docs/src/main/paradox/server-side/server-https-support.md
@@ -25,9 +25,6 @@ Signing authorities often provide instructions on how to
create a Java keystore
configuration). If you want to generate your own certificates, the official
Oracle documentation on how to generate a
keystore using the JDK keytool utility can be found
[here](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html).
-SSL-Config provides a more targeted guide on generating certificates, so we
recommend you start with the guide
-titled [Generating X.509
Certificates](https://lightbend.github.io/ssl-config/CertificateGeneration.html).
-
<a id="using-https"></a>
## Using HTTPS
diff --git a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala
index e4ef686fb..07c510bd8 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala
@@ -679,7 +679,8 @@ class HttpExt @InternalStableApi /* constructor signature
is hardcoded in Teleme
/**
* Gets the current default client-side [[HttpsConnectionContext]].
- * Defaults used here can be configured using ssl-config or the context can
be replaced using [[setDefaultClientHttpsContext]]
+ * By default it is created from `SSLContext.getDefault` (which can be
configured using the standard JSSE system
+ * properties), or the context can be replaced using
[[setDefaultClientHttpsContext]]
*/
def defaultClientHttpsContext: HttpsConnectionContext =
synchronized {
diff --git
a/http-core/src/test/scala/org/apache/pekko/http/scaladsl/ClientServerSpec.scala
b/http-core/src/test/scala/org/apache/pekko/http/scaladsl/ClientServerSpec.scala
index 57d9b1151..78e89bb11 100644
---
a/http-core/src/test/scala/org/apache/pekko/http/scaladsl/ClientServerSpec.scala
+++
b/http-core/src/test/scala/org/apache/pekko/http/scaladsl/ClientServerSpec.scala
@@ -689,7 +689,7 @@ Host: example.com
}
}
- "complete a request/response over https, disabling hostname verification
with SSLConfigSettings" in
+ "complete a request/response over https, disabling hostname verification
with a custom SSLEngine" in
Utils.assertAllStagesStopped {
val serverConnectionContext = ExampleHttpContexts.exampleServerContext
val handlerFlow: Flow[HttpRequest, HttpResponse, Any] =
Flow[HttpRequest].map { _ =>
diff --git
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
index e3d3a26f9..70bcaf679 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
@@ -78,7 +78,8 @@ public class HttpAPIsTest extends JUnitJupiterRouteTest {
http.outgoingConnection(toHost("pekko.apache.org"));
http.outgoingConnection(toHost("pekko.apache.org", 8080));
http.outgoingConnection(toHost("https://pekko.apache.org";));
- http.outgoingConnection(toHostHttps("pekko.apache.org")); // default ssl
context (ssl-config)
+ http.outgoingConnection(
+ toHostHttps("pekko.apache.org")); // default ssl context
(SSLContext.getDefault)
http.outgoingConnection(
toHostHttps("ssh://pekko.apache.org")); // throws, we explicitly
require https or ""
http.outgoingConnection(
@@ -103,7 +104,7 @@ public class HttpAPIsTest extends JUnitJupiterRouteTest {
.logTo(system().log())
.https();
- // in future we can add modify(context -> Context) to "keep ssl-config
defaults, but tweak them
+ // in future we can add modify(context -> Context) to "keep the default
context, but tweak it
// in code)
http.newHostConnectionPool("pekko.apache.org", materializer());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
