Attachment #32486 for bug #57540

View | Details | Raw Unified | Return to bug 57540
Collapse All | Expand All

Lines 975-980 Link Here

(-)java/org/apache/coyote/http11/Http11Processor.java (+5 lines)
975	request.setAttribute	975	request.setAttribute
976	(SSLSupport.SESSION_ID_KEY, sslO);	976	(SSLSupport.SESSION_ID_KEY, sslO);
977	}	977	}
		978	sslO = sslSupport.getProtocol();
		979	if (sslO != null) {
		980	request.setAttribute
		981	(SSLSupport.PROTOCOL_VERSION_KEY, sslO);
		982	}
978	request.setAttribute(SSLSupport.SESSION_MGR, sslSupport);	983	request.setAttribute(SSLSupport.SESSION_MGR, sslSupport);
979	}	984	}
980	} catch (Exception e) {	985	} catch (Exception e) {

Lines 117-120 Link Here

(-)java/org/apache/tomcat/util/net/AprSSLSupport.java (+5 lines)
117	throw new IOException(e);	117	throw new IOException(e);
118	}	118	}
119	}	119	}
		120
		121	@Override
		122	public String getProtocol() throws IOException {
		123	return "method not yet implemented";
		124	}
120	}	125	}

Lines 55-60 Link Here

(-)java/org/apache/tomcat/util/net/SSLSupport.java (+12 lines)
55	public static final String SESSION_MGR =	55	public static final String SESSION_MGR =
56	"javax.servlet.request.ssl_session_mgr";	56	"javax.servlet.request.ssl_session_mgr";
57		57
		58	/**
		59	* The request attribute key under which the String indicating the protocol
		60	* that created the SSL socket is recorded - e.g. TLSv1 or TLSv1.2 etc.
		61	*/
		62	public static final String PROTOCOL_VERSION_KEY =
		63	"org.apache.tomcat.util.net.secure_protocol_version";
58		64
59	/**	65	/**
60	* The cipher suite being used on this connection.	66	* The cipher suite being used on this connection.
Lines 106-110 Link Here
106	* @throws IOException If an error occurs trying to obtain the session ID	112	* @throws IOException If an error occurs trying to obtain the session ID
107	*/	113	*/
108	public String getSessionId() throws IOException;	114	public String getSessionId() throws IOException;
		115
		116	/**
		117	* @return the protocol String indicating how the SSL socket was created
		118	* e.g. TLSv1 or TLSv1.2 etc.
		119	*/
		120	public String getProtocol() throws IOException;
109	}	121	}
110		122

Lines 180-184 Link Here

(-)java/org/apache/tomcat/util/net/jsse/JSSESupport.java (+9 lines)
180	public void invalidateSession() {	180	public void invalidateSession() {
181	session.invalidate();	181	session.invalidate();
182	}	182	}
		183
		184	@Override
		185	public String getProtocol() throws IOException {
		186	if (session == null) {
		187	return null;
		188	}
		189	return session.getProtocol();
		190	}
		191
183	}	192	}
184		193

Return to bug 57540