Lines 98-103
Link Here
|
98 |
import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload; |
98 |
import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload; |
99 |
import org.apache.tomcat.util.http.fileupload.servlet.ServletRequestContext; |
99 |
import org.apache.tomcat.util.http.fileupload.servlet.ServletRequestContext; |
100 |
import org.apache.tomcat.util.http.parser.AcceptLanguage; |
100 |
import org.apache.tomcat.util.http.parser.AcceptLanguage; |
|
|
101 |
import org.apache.tomcat.util.net.SSLSupport; |
101 |
import org.apache.tomcat.util.res.StringManager; |
102 |
import org.apache.tomcat.util.res.StringManager; |
102 |
import org.ietf.jgss.GSSCredential; |
103 |
import org.ietf.jgss.GSSCredential; |
103 |
import org.ietf.jgss.GSSException; |
104 |
import org.ietf.jgss.GSSException; |
Lines 853-859
Link Here
|
853 |
if(attr != null) { |
854 |
if(attr != null) { |
854 |
return attr; |
855 |
return attr; |
855 |
} |
856 |
} |
856 |
if( isSSLAttribute(name) ) { |
857 |
if( isSSLAttribute(name) || name.equals(SSLSupport.PROTOCOL_VERSION_KEY)) { |
857 |
coyoteRequest.action(ActionCode.REQ_SSL_ATTRIBUTE, |
858 |
coyoteRequest.action(ActionCode.REQ_SSL_ATTRIBUTE, |
858 |
coyoteRequest); |
859 |
coyoteRequest); |
859 |
attr = coyoteRequest.getAttribute(Globals.CERTIFICATES_ATTR); |
860 |
attr = coyoteRequest.getAttribute(Globals.CERTIFICATES_ATTR); |
Lines 876-881
Link Here
|
876 |
if(attr != null) { |
877 |
if(attr != null) { |
877 |
attributes.put(Globals.SSL_SESSION_MGR_ATTR, attr); |
878 |
attributes.put(Globals.SSL_SESSION_MGR_ATTR, attr); |
878 |
} |
879 |
} |
|
|
880 |
attr = coyoteRequest.getAttribute(SSLSupport.PROTOCOL_VERSION_KEY); |
881 |
if(attr != null) { |
882 |
attributes.put(SSLSupport.PROTOCOL_VERSION_KEY, attr); |
883 |
} |
879 |
attr = attributes.get(name); |
884 |
attr = attributes.get(name); |
880 |
sslAttributesParsed = true; |
885 |
sslAttributesParsed = true; |
881 |
} |
886 |
} |