--- java/org/apache/tomcat/jni/SSL.java	(revision 1632261)
+++ java/org/apache/tomcat/jni/SSL.java	(working copy)
@@ -70,7 +70,9 @@ 
     public static final int SSL_PROTOCOL_SSLV2 = (1<<0);
     public static final int SSL_PROTOCOL_SSLV3 = (1<<1);
     public static final int SSL_PROTOCOL_TLSV1 = (1<<2);
-    public static final int SSL_PROTOCOL_ALL   = (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1);
+    public static final int SSL_PROTOCOL_TLS11 = (1<<3);
+    public static final int SSL_PROTOCOL_TLS12 = (1<<4);
+    public static final int SSL_PROTOCOL_ALL   = (SSL_PROTOCOL_SSLV2|SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1|SSL_PROTOCOL_TLS11|SSL_PROTOCOL_TLS12);
 
     /*
      * Define the SSL verify levels
--- java/org/apache/tomcat/util/net/AprEndpoint.java	(revision 1632261)
+++ java/org/apache/tomcat/util/net/AprEndpoint.java	(working copy)
@@ -506,6 +506,10 @@ 
                         value |= SSL.SSL_PROTOCOL_SSLV3;
                     } else if ("TLSv1".equalsIgnoreCase(protocol)) {
                         value |= SSL.SSL_PROTOCOL_TLSV1;
+                    } else if ("TLSv1.1".equalsIgnoreCase(protocol)) {
+                        value |= SSL.SSL_PROTOCOL_TLS11;
+                    } else if ("TLSv1.2".equalsIgnoreCase(protocol)) {
+                        value |= SSL.SSL_PROTOCOL_TLS12;
                     } else if ("all".equalsIgnoreCase(protocol)) {
                         value |= SSL.SSL_PROTOCOL_ALL;
                     } else {