Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 9.4.x

This commit is contained in:
Chris Walker 2019-09-05 13:20:19 -04:00
parent c288430f08 3a6b26d292
commit f7a0156961
No known key found for this signature in database
GPG Key ID: 422B41E6AAA5A72C
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-client/src/test/java/org/eclipse/jetty/client/HostnameVerificationTest.java
View File

@ -106,7 +106,7 @@ public class HostnameVerificationTest
/** /**
* This test is supposed to verify that hostname verification works as described in: * This test is supposed to verify that hostname verification works as described in:
* http://www.ietf.org/rfc/rfc2818.txt section 3.1. It uses a certificate with a common name different to localhost * http://www.ietf.org/rfc/rfc2818.txt section 3.1. It uses a certificate with a common name different to localhost
* and sends a request to localhost. This should fail with a SSLHandshakeException. * and sends a request to localhost. This should fail with an SSLHandshakeException.
* *
* @throws Exception on test failure * @throws Exception on test failure
*/ */

2
jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java
View File

@ -1803,7 +1803,7 @@ public class SslBytesServerTest extends SslBytesTest
assertTrue(latch.await(idleTimeout * 2, TimeUnit.MILLISECONDS)); assertTrue(latch.await(idleTimeout * 2, TimeUnit.MILLISECONDS));
// Be sure that the server sent a SSL close alert // Be sure that the server sent an SSL close alert
TLSRecord record = proxy.readFromServer(); TLSRecord record = proxy.readFromServer();
assertNotNull(record); assertNotNull(record);
assertEquals(TLSRecord.Type.ALERT, record.getType()); assertEquals(TLSRecord.Type.ALERT, record.getType());

2
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml
View File

@ -9,7 +9,7 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Add a SSL Connector with no protocol factories --> <!-- Add an SSL Connector with no protocol factories -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>

2
jetty-server/src/main/config/etc/jetty-ssl.xml
View File

@ -9,7 +9,7 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Add a SSL Connector with no protocol factories --> <!-- Add an SSL Connector with no protocol factories -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>

4
jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java
View File

@ -352,7 +352,7 @@ public class ForwardedRequestCustomizer implements Customizer
} }
/** /**
* @return true if the presence of a SSL session or certificate header is sufficient * @return true if the presence of an SSL session or certificate header is sufficient
* to indicate a secure request (default is true) * to indicate a secure request (default is true)
*/ */
public boolean isSslIsSecure() public boolean isSslIsSecure()
@ -361,7 +361,7 @@ public class ForwardedRequestCustomizer implements Customizer
} }
/** /**
* @param sslIsSecure true if the presence of a SSL session or certificate header is sufficient * @param sslIsSecure true if the presence of an SSL session or certificate header is sufficient
* to indicate a secure request (default is true) * to indicate a secure request (default is true)
*/ */
public void setSslIsSecure(boolean sslIsSecure) public void setSslIsSecure(boolean sslIsSecure)

2
jetty-server/src/test/java/org/eclipse/jetty/server/OptionalSslConnectionTest.java
View File

@ -111,7 +111,7 @@ public class OptionalSslConnectionTest
assertEquals(HttpStatus.OK_200, response.getStatus()); assertEquals(HttpStatus.OK_200, response.getStatus());
} }
// Then try a SSL connection. // Then try an SSL connection.
SslContextFactory sslContextFactory = new SslContextFactory.Client(true); SslContextFactory sslContextFactory = new SslContextFactory.Client(true);
sslContextFactory.start(); sslContextFactory.start();
try (Socket ssl = sslContextFactory.newSslSocket()) try (Socket ssl = sslContextFactory.newSslSocket())