changeset 891:b48361bd68e3

remove isIntegral()
author Franklin Schmidt <fschmidt@gmail.com>
date Thu, 06 Oct 2016 23:31:44 -0600
parents 5dc615c34848
children 093460816905
files src/org/eclipse/jetty/server/AbstractHttpConnection.java src/org/eclipse/jetty/server/Connector.java src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
diffstat 3 files changed, 0 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
diff -r 5dc615c34848 -r b48361bd68e3 src/org/eclipse/jetty/server/AbstractHttpConnection.java
--- a/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Thu Oct 06 23:29:22 2016 -0600
+++ b/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Thu Oct 06 23:31:44 2016 -0600
@@ -271,18 +271,6 @@
 
 	/* ------------------------------------------------------------ */
 	/**
-	 * Find out if the request supports INTEGRAL security.
-	 * @param request the incoming HTTP request
-	 * @return the result of calling {@link Connector#isIntegral(Request)}, or false
-	 * if there is no connector
-	 */
-	public boolean isIntegral(Request request)
-	{
-		return _connector != null && _connector.isIntegral(request);
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
 	 * @return <code>false</code> (this method is not yet implemented)
 	 */
 	public boolean getResolveNames()
diff -r 5dc615c34848 -r b48361bd68e3 src/org/eclipse/jetty/server/Connector.java
--- a/src/org/eclipse/jetty/server/Connector.java	Thu Oct 06 23:29:22 2016 -0600
+++ b/src/org/eclipse/jetty/server/Connector.java	Thu Oct 06 23:31:44 2016 -0600
@@ -364,15 +364,6 @@
 
 	/* ------------------------------------------------------------ */
 	/*
-	 * @see org.eclipse.jetty.server.Connector#isConfidential(org.eclipse.jetty.server .Request)
-	 */
-	public boolean isIntegral(Request request)
-	{
-		return false;
-	}
-
-	/* ------------------------------------------------------------ */
-	/*
 	 * @see org.eclipse.jetty.server.Connector#getIntegralScheme()
 	 */
 	public String getIntegralScheme()
diff -r 5dc615c34848 -r b48361bd68e3 src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
--- a/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java	Thu Oct 06 23:29:22 2016 -0600
+++ b/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java	Thu Oct 06 23:31:44 2016 -0600
@@ -531,21 +531,6 @@
 		return confidentialPort==0||confidentialPort==request.getServerPort();
 	}
 
-	/* ------------------------------------------------------------ */
-	/**
-	 * By default, we're integral, given we speak SSL. But, if we've been told
-	 * about an integral port, and said port is not our port, then we're not.
-	 * This allows separation of listeners providing INTEGRAL versus
-	 * CONFIDENTIAL constraints, such as one SSL listener configured to require
-	 * client certs providing CONFIDENTIAL, whereas another SSL listener not
-	 * requiring client certs providing mere INTEGRAL constraints.
-	 */
-	@Override
-	public boolean isIntegral(Request request)
-	{
-		return true;
-	}
-
 	/* ------------------------------------------------------------------------------- */
 	@Override
 	protected AsyncConnection newConnection(SocketChannel channel, AsyncEndPoint endpoint)