tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r917927 - /tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java
Date Tue, 02 Mar 2010 09:09:14 GMT
Author: mturk
Date: Tue Mar  2 09:09:14 2010
New Revision: 917927

URL: http://svn.apache.org/viewvc?rev=917927&view=rev
Log:
Marge typo fixes from tomcat trunk

Modified:
    tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java

Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java?rev=917927&r1=917926&r2=917927&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java Tue Mar  2 09:09:14
2010
@@ -62,13 +62,13 @@
     public static native void setContextId(long ctx, String id);
 
     /**
-     * Asssociate BIOCallback for input or output data capture.
+     * Associate BIOCallback for input or output data capture.
      * <br />
      * First word in the output string will contain error
      * level in the form:
      * <PRE>
      * [ERROR]  -- Critical error messages
-     * [WARN]   -- Varning messages
+     * [WARN]   -- Warning messages
      * [INFO]   -- Informational messages
      * [DEBUG]  -- Debugging messaged
      * </PRE>
@@ -119,7 +119,7 @@
      * directive can be used both in per-server and per-directory context.
      * In per-server context it applies to the standard SSL handshake when a
      * connection is established. In per-directory context it forces a SSL
-     * renegotation with the reconfigured Cipher Suite after the HTTP request
+     * renegotiation with the reconfigured Cipher Suite after the HTTP request
      * was read but before the HTTP response is sent.
      * @param ctx Server or Client context to use.
      * @param ciphers An SSL cipher specification.
@@ -192,7 +192,7 @@
      * @param cert Certificate file.
      * @param key Private Key file to use if not in cert.
      * @param password Certificate password. If null and certificate
-     *                 is encrypted, password prompt will be dispayed.
+     *                 is encrypted, password prompt will be displayed.
      * @param idx Certificate index SSL_AIDX_RSA or SSL_AIDX_DSA.
      */
     public static native boolean setCertificate(long ctx, String cert,
@@ -254,7 +254,7 @@
      * Authentication. Notice that this directive can be used both in per-server
      * and per-directory context. In per-server context it applies to the client
      * authentication process used in the standard SSL handshake when a connection
-     * is established. In per-directory context it forces a SSL renegotation with
+     * is established. In per-directory context it forces a SSL renegotiation with
      * the reconfigured client verification level after the HTTP request was read
      * but before the HTTP response is sent.
      * <br />



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message