Mercurial Hosting > luan
changeset 893:d1c302afeeb6
remove _confidentialPort
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Thu, 06 Oct 2016 23:36:34 -0600 |
| parents | 093460816905 |
| children | c33a99fca826 |
| 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 093460816905 -r d1c302afeeb6 src/org/eclipse/jetty/server/Connector.java --- a/src/org/eclipse/jetty/server/Connector.java Thu Oct 06 23:33:35 2016 -0600 +++ b/src/org/eclipse/jetty/server/Connector.java Thu Oct 06 23:36:34 2016 -0600 @@ -63,7 +63,6 @@ private String _host; public final int port; private String _confidentialScheme = HttpSchemes.HTTPS; - private int _confidentialPort = 0; private int _acceptors = 1; private int _acceptorPriorityOffset = 0; private boolean _useDNS; @@ -343,15 +342,6 @@ } /* ------------------------------------------------------------ */ - /* - * @see org.eclipse.jetty.server.Connector#getConfidentialPort() - */ - public int getConfidentialPort() - { - return _confidentialPort; - } - - /* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */ /* * @see org.eclipse.jetty.server.Connector#getConfidentialScheme() @@ -372,16 +362,6 @@ /* ------------------------------------------------------------ */ /** - * @param confidentialPort - * The confidentialPort to set. - */ - public void setConfidentialPort(int confidentialPort) - { - _confidentialPort = confidentialPort; - } - - /* ------------------------------------------------------------ */ - /** * @param confidentialScheme * The confidentialScheme to set. */
diff -r 093460816905 -r d1c302afeeb6 src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java --- a/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java Thu Oct 06 23:33:35 2016 -0600 +++ b/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java Thu Oct 06 23:36:34 2016 -0600 @@ -527,8 +527,7 @@ @Override public boolean isConfidential(Request request) { - final int confidentialPort=getConfidentialPort(); - return confidentialPort==0||confidentialPort==request.getServerPort(); + return true; } /* ------------------------------------------------------------------------------- */