Mercurial Hosting > luan
changeset 890:5dc615c34848
remove _integralPort
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Thu, 06 Oct 2016 23:29:22 -0600 |
| parents | 5731a7707466 |
| children | b48361bd68e3 |
| files | src/org/eclipse/jetty/server/Connector.java src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java |
| diffstat | 2 files changed, 1 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
diff -r 5731a7707466 -r 5dc615c34848 src/org/eclipse/jetty/server/Connector.java --- a/src/org/eclipse/jetty/server/Connector.java Thu Oct 06 23:24:30 2016 -0600 +++ b/src/org/eclipse/jetty/server/Connector.java Thu Oct 06 23:29:22 2016 -0600 @@ -63,7 +63,6 @@ private String _host; public final int port; private String _integralScheme = HttpSchemes.HTTPS; - private int _integralPort = 0; private String _confidentialScheme = HttpSchemes.HTTPS; private int _confidentialPort = 0; private int _acceptors = 1; @@ -374,15 +373,6 @@ /* ------------------------------------------------------------ */ /* - * @see org.eclipse.jetty.server.Connector#getConfidentialPort() - */ - public int getIntegralPort() - { - return _integralPort; - } - - /* ------------------------------------------------------------ */ - /* * @see org.eclipse.jetty.server.Connector#getIntegralScheme() */ public String getIntegralScheme() @@ -421,16 +411,6 @@ /* ------------------------------------------------------------ */ /** - * @param integralPort - * The integralPort to set. - */ - public void setIntegralPort(int integralPort) - { - _integralPort = integralPort; - } - - /* ------------------------------------------------------------ */ - /** * @param integralScheme * The integralScheme to set. */
diff -r 5731a7707466 -r 5dc615c34848 src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java --- a/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java Thu Oct 06 23:24:30 2016 -0600 +++ b/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java Thu Oct 06 23:29:22 2016 -0600 @@ -543,8 +543,7 @@ @Override public boolean isIntegral(Request request) { - final int integralPort=getIntegralPort(); - return integralPort==0||integralPort==request.getServerPort(); + return true; } /* ------------------------------------------------------------------------------- */