You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2018/05/10 14:12:36 UTC
httpcomponents-client git commit: HTTPCORE-524: updated examples to
use nghttp2.org instead of no longer functional http2bin.org
Repository: httpcomponents-client
Updated Branches:
refs/heads/master e3cdb72de -> a6a29892f
HTTPCORE-524: updated examples to use nghttp2.org instead of no longer functional http2bin.org
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/a6a29892
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/a6a29892
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/a6a29892
Branch: refs/heads/master
Commit: a6a29892fae1f870c4691a1c0079154b4272d9dc
Parents: e3cdb72
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Thu May 10 15:57:49 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Thu May 10 15:58:49 2018 +0200
----------------------------------------------------------------------
.../AsyncClientHttp2FullDuplexExchange.java | 2 +-
.../examples/AsyncClientHttp2Multiplexing.java | 4 ++--
.../examples/AsyncClientHttp2ServerPush.java | 4 ++--
.../http/examples/AsyncClientTlsAlpn.java | 24 +++-----------------
4 files changed, 8 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a6a29892/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2FullDuplexExchange.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2FullDuplexExchange.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2FullDuplexExchange.java
index b550f9d..5df9ae0 100644
--- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2FullDuplexExchange.java
+++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2FullDuplexExchange.java
@@ -70,7 +70,7 @@ public class AsyncClientHttp2FullDuplexExchange {
client.start();
- final URI requestUri = new URI("http://http2bin.org/post");
+ final URI requestUri = new URI("http://nghttp2.org/httpbin/post");
final BasicRequestProducer requestProducer = new BasicRequestProducer(
"POST", requestUri, new BasicAsyncEntityProducer("stuff", ContentType.TEXT_PLAIN));
final BasicResponseConsumer<String> responseConsumer = new BasicResponseConsumer<>(
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a6a29892/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2Multiplexing.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2Multiplexing.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2Multiplexing.java
index e7e754a..16d8e28 100644
--- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2Multiplexing.java
+++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2Multiplexing.java
@@ -62,11 +62,11 @@ public class AsyncClientHttp2Multiplexing {
client.start();
- final HttpHost target = new HttpHost("http2bin.org");
+ final HttpHost target = new HttpHost("nghttp2.org");
final Future<AsyncClientEndpoint> leaseFuture = client.lease(target, null);
final AsyncClientEndpoint endpoint = leaseFuture.get(30, TimeUnit.SECONDS);
try {
- final String[] requestUris = new String[] {"/", "/ip", "/user-agent", "/headers"};
+ final String[] requestUris = new String[] {"/httpbin/ip", "/httpbin/user-agent", "/httpbin/headers"};
final CountDownLatch latch = new CountDownLatch(requestUris.length);
for (final String requestUri: requestUris) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a6a29892/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java
index e7d7b42..ecf8d2b 100644
--- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java
+++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java
@@ -114,8 +114,8 @@ public class AsyncClientHttp2ServerPush {
});
- final HttpHost target = new HttpHost("http2bin.org");
- final String requestURI = "/";
+ final HttpHost target = new HttpHost("nghttp2.org");
+ final String requestURI = "/httpbin/";
final Future<Void> future = client.execute(
AsyncRequestBuilder.get(target, requestURI).build(),
new AbstractCharResponseConsumer<Void>() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a6a29892/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientTlsAlpn.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientTlsAlpn.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientTlsAlpn.java
index 77bb55c..b4aa36d 100644
--- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientTlsAlpn.java
+++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientTlsAlpn.java
@@ -26,11 +26,8 @@
*/
package org.apache.hc.client5.http.examples;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
import java.util.concurrent.Future;
-import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
@@ -49,7 +46,6 @@ import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.io.ShutdownType;
import org.apache.hc.core5.ssl.SSLContexts;
-import org.apache.hc.core5.ssl.TrustStrategy;
/**
* This example demonstrates how to avoid the illegal reflective access operation warning
@@ -58,22 +54,8 @@ import org.apache.hc.core5.ssl.TrustStrategy;
public class AsyncClientTlsAlpn {
public final static void main(final String[] args) throws Exception {
- // Trust standard CA and those trusted by our custom strategy
- final SSLContext sslcontext = SSLContexts.custom()
- .loadTrustMaterial(new TrustStrategy() {
-
- @Override
- public boolean isTrusted(
- final X509Certificate[] chain,
- final String authType) throws CertificateException {
- final X509Certificate cert = chain[0];
- return "CN=http2bin.org".equalsIgnoreCase(cert.getSubjectDN().getName());
- }
-
- })
- .build();
final TlsStrategy tlsStrategy = new H2TlsStrategy(
- sslcontext,
+ SSLContexts.createSystemDefault(),
H2TlsStrategy.getDefaultHostnameVerifier()) {
// IMPORTANT uncomment the following method when running Java 9 or older
@@ -94,8 +76,8 @@ public class AsyncClientTlsAlpn {
client.start();
- final HttpHost target = new HttpHost("http2bin.org", 443, "https");
- final String requestUri = "/";
+ final HttpHost target = new HttpHost("nghttp2.org", 443, "https");
+ final String requestUri = "/httpbin/";
final HttpClientContext clientContext = HttpClientContext.create();
final SimpleHttpRequest request = SimpleHttpRequest.get(target, requestUri);