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

(-)webapps/docs/config/http.xml (-6 / +14 lines)
Lines 48-55 Link Here
48
48
49
  <p>If you wish to configure the <strong>Connector</strong> that is used
49
  <p>If you wish to configure the <strong>Connector</strong> that is used
50
  for connections to web servers using the AJP protocol (such as the
50
  for connections to web servers using the AJP protocol (such as the
51
  <code>mod_jk 1.2.x</code> connector for Apache 1.3), see
51
  <code>mod_jk 1.2.x</code> connector for Apache 1.3), please refer to the
52
  <a href="ajp.html">here</a> instead.</p>
52
  <a href="ajp.html">AJP Connector</a> documentation.</p>
53
53
54
  <p>Each incoming request requires
54
  <p>Each incoming request requires
55
  a thread for the duration of that request.  If more simultaneous requests
55
  a thread for the duration of that request.  If more simultaneous requests
Lines 896-906 Link Here
896
  attributes to the values <code>https</code> and <code>true</code>
896
  attributes to the values <code>https</code> and <code>true</code>
897
  respectively, to pass correct information to the servlets.</p>
897
  respectively, to pass correct information to the servlets.</p>
898
898
899
  <p>The BIO and NIO connectors used the JSSE SSL whereas the APR/native
899
  <p>The BIO and NIO connectors use the JSSE SSL whereas the APR/native
900
  connector uses OpenSSL. Therefore, in addition to using different attributes
900
  connector uses OpenSSL. Therefore, in addition to using different attributes
901
  to configure SSL, the APR/native connector also requires keys and certificates
901
  to configure SSL, the APR/native connector also requires keys and certificates
902
  to be provided in a different format.</p>
902
  to be provided in a different format.</p>
903
903
904
  <p>For more information, see the
905
  <a href="../ssl-howto.html">SSL Configuration HOW-TO</a>.</p>
906
907
  <subsection name="SSL Support - BIO and NIO">
908
904
  <p>The BIO and NIO connectors use the following attributes to configure SSL:
909
  <p>The BIO and NIO connectors use the following attributes to configure SSL:
905
  </p>
910
  </p>
906
911
Lines 1090-1095 Link Here
1090
1095
1091
  </attributes>
1096
  </attributes>
1092
1097
1098
  </subsection>
1099
1100
  <subsection name="SSL Support - APR/Native">
1101
1093
  <p>When APR/native is enabled, the HTTPS connector will use a socket poller
1102
  <p>When APR/native is enabled, the HTTPS connector will use a socket poller
1094
  for keep-alive, increasing scalability of the server. It also uses OpenSSL,
1103
  for keep-alive, increasing scalability of the server. It also uses OpenSSL,
1095
  which may be more optimized than JSSE depending on the processor being used,
1104
  which may be more optimized than JSSE depending on the processor being used,
Lines 1203-1217 Link Here
1203
1212
1204
  </attributes>
1213
  </attributes>
1205
1214
1206
  <p>For more information, see the
1215
  </subsection>
1207
  <a href="../ssl-howto.html">SSL Configuration HOW-TO</a>.</p>
1208
1216
1209
  </subsection>
1217
  </subsection>
1210
  <subsection name="Connector Comparison">
1218
  <subsection name="Connector Comparison">
1211
1219
1212
    <p>Below is a small chart that shows how the connectors differentiate.</p>
1220
    <p>Below is a small chart that shows how the connectors differentiate.</p>
1213
    <source>
1221
    <source>
1214
                       Java Blocking Connector   Java Nio Blocking Connector   APR/native Connector
1222
                       Java Blocking Connector   Java Non Blocking Connector   APR/native Connector
1215
                                 BIO                         NIO                       APR
1223
                                 BIO                         NIO                       APR
1216
    Classname              Http11Protocol             Http11NioProtocol         Http11AprProtocol
1224
    Classname              Http11Protocol             Http11NioProtocol         Http11AprProtocol
1217
    Tomcat Version           3.x onwards                 6.x onwards              5.5.x onwards
1225
    Tomcat Version           3.x onwards                 6.x onwards              5.5.x onwards

Return to bug 53456