Mercurial Hosting > luan

comparison src/org/eclipse/jetty/server/ssl/SslSocketConnector.java @ 820:8e9db0bbf4f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove org.eclipse.jetty.util.log and upgrade slf4j
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 13 Sep 2016 23:13:06 -0600
parents 3428c60d7cfc
children
comparison
equal deleted inserted replaced
819:17bd0b170ed6 820:8e9db0bbf4f9
34 import org.eclipse.jetty.io.EndPoint; 34 import org.eclipse.jetty.io.EndPoint;
35 import org.eclipse.jetty.io.RuntimeIOException; 35 import org.eclipse.jetty.io.RuntimeIOException;
36 import org.eclipse.jetty.io.bio.SocketEndPoint; 36 import org.eclipse.jetty.io.bio.SocketEndPoint;
37 import org.eclipse.jetty.server.Request; 37 import org.eclipse.jetty.server.Request;
38 import org.eclipse.jetty.server.bio.SocketConnector; 38 import org.eclipse.jetty.server.bio.SocketConnector;
39 import org.eclipse.jetty.util.log.Log; 39 import org.slf4j.Logger;
40 import org.eclipse.jetty.util.log.Logger; 40 import org.slf4j.LoggerFactory;
41 import org.eclipse.jetty.util.ssl.SslContextFactory; 41 import org.eclipse.jetty.util.ssl.SslContextFactory;
42 42
43 /* ------------------------------------------------------------ */ 43 /* ------------------------------------------------------------ */
44 /** 44 /**
45 * SSL Socket Connector. 45 * SSL Socket Connector.
55 * 55 *
56 * 56 *
57 */ 57 */
58 public class SslSocketConnector extends SocketConnector implements SslConnector 58 public class SslSocketConnector extends SocketConnector implements SslConnector
59 { 59 {
60 private static final Logger LOG = Log.getLogger(SslSocketConnector.class); 60 private static final Logger LOG = LoggerFactory.getLogger(SslSocketConnector.class);
61 61
62 private final SslContextFactory _sslContextFactory; 62 private final SslContextFactory _sslContextFactory;
63 private int _handshakeTimeout = 0; //0 means use maxIdleTime 63 private int _handshakeTimeout = 0; //0 means use maxIdleTime
64 64
65 /* ------------------------------------------------------------ */ 65 /* ------------------------------------------------------------ */
653 if (handshook) 653 if (handshook)
654 { 654 {
655 if (!_sslContextFactory.isAllowRenegotiate()) 655 if (!_sslContextFactory.isAllowRenegotiate())
656 { 656 {
657 LOG.warn("SSL renegotiate denied: "+ssl); 657 LOG.warn("SSL renegotiate denied: "+ssl);
658 try{ssl.close();}catch(IOException e){LOG.warn(e);} 658 try{ssl.close();}catch(IOException e){LOG.warn("",e);}
659 } 659 }
660 } 660 }
661 else 661 else
662 handshook=true; 662 handshook=true;
663 } 663 }
669 669
670 super.run(); 670 super.run();
671 } 671 }
672 catch (SSLException e) 672 catch (SSLException e)
673 { 673 {
674 LOG.debug(e); 674 LOG.debug("",e);
675 try{close();} 675 try{close();}
676 catch(IOException e2){LOG.ignore(e2);} 676 catch(IOException e2){LOG.trace("",e2);}
677 } 677 }
678 catch (IOException e) 678 catch (IOException e)
679 { 679 {
680 LOG.debug(e); 680 LOG.debug("",e);
681 try{close();} 681 try{close();}
682 catch(IOException e2){LOG.ignore(e2);} 682 catch(IOException e2){LOG.trace("",e2);}
683 } 683 }
684 } 684 }
685 } 685 }
686 686
687 /* ------------------------------------------------------------ */ 687 /* ------------------------------------------------------------ */