tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni Address.java Multicast.java Pool.java SSL.java
Date Wed, 01 Jun 2005 12:50:51 GMT
mturk       2005/06/01 05:50:51

  Modified:    jni/java/org/apache/tomcat/jni Address.java Multicast.java
                        Pool.java SSL.java
  Log:
  Fix javadocs.
  
  Revision  Changes    Path
  1.7       +3 -3      jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Address.java
  
  Index: Address.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Address.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Address.java	19 May 2005 17:37:56 -0000	1.6
  +++ Address.java	1 Jun 2005 12:50:51 -0000	1.7
  @@ -74,9 +74,9 @@
   
       /**
        * Return the IP address (in numeric address string format) in
  -     * an APR socket address.  APR will allocate storage for the IP address 
  +     * an APR socket address.  APR will allocate storage for the IP address
        * string from the pool of the apr_sockaddr_t.
  -     * @param ss The socket address to reference.
  +     * @param sa The socket address to reference.
        * @return The IP address.
        */
       public static native String getip(long sa);
  
  
  
  1.2       +4 -3      jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Multicast.java
  
  Index: Multicast.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Multicast.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Multicast.java	19 May 2005 18:30:13 -0000	1.1
  +++ Multicast.java	1 Jun 2005 12:50:51 -0000	1.2
  @@ -53,8 +53,9 @@
        * Set the Multicast Time to Live (ttl) for a multicast transmission.
        * @param sock The socket to set the multicast ttl
        * @param ttl Time to live to Assign. 0-255, default=1
  -     * @remark If the TTL is 0, packets will only be seen by sockets on
  -     * the local machine, and only when multicast loopback is enabled.
  +     * <br /><b>Remark :</b> If the TTL is 0, packets will only be seen
  +     * by sockets on the local machine,
  +     * and only when multicast loopback is enabled.
        */
       public static native int hops(long sock, int ttl);
   
  
  
  
  1.6       +6 -6      jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Pool.java
  
  Index: Pool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Pool.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Pool.java	28 May 2005 07:48:28 -0000	1.5
  +++ Pool.java	1 Jun 2005 12:50:51 -0000	1.6
  @@ -138,11 +138,11 @@
        * @param data The user data associated with the pool.
        * @param key The key to use for association
        * @param pool The current pool
  -     * @warning The data to be attached to the pool should have a life span
  -     *          at least as long as the pool it is being attached to.
  -     *          Object attached to the pool will be globaly referenced
  -     *          untill the pool is cleared or dataSet is called with the
  -     *          null data.
  +     * <br /><b>Warning :</b>
  +     * The data to be attached to the pool should have a life span
  +     * at least as long as the pool it is being attached to.
  +     * Object attached to the pool will be globaly referenced
  +     * untill the pool is cleared or dataSet is called with the null data.
        * @return APR Status code.
        */
        public static native int dataSet(long pool, String key, Object data);
  
  
  
  1.7       +11 -11    jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSL.java
  
  Index: SSL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/SSL.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SSL.java	1 Jun 2005 12:06:55 -0000	1.6
  +++ SSL.java	1 Jun 2005 12:50:51 -0000	1.7
  @@ -97,18 +97,18 @@
       public static final int SSL_OP_SSLEAY_080_CLIENT_DH_BUG         = 0x00000080;
       public static final int SSL_OP_TLS_D5_BUG                       = 0x00000100;
       public static final int SSL_OP_TLS_BLOCK_PADDING_BUG            = 0x00000200;
  -    
  +
       /* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
        * in OpenSSL 0.9.6d.  Usually (depending on the application protocol)
        * the workaround is not needed.  Unfortunately some broken SSL/TLS
        * implementations cannot handle it at all, which is why we include
        * it in SSL_OP_ALL. */
       public static final int SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS      = 0x00000800;
  -    
  +
       /* SSL_OP_ALL: various bug workarounds that should be rather harmless.
        *             This used to be 0x000FFFFFL before 0.9.7. */
       public static final int SSL_OP_ALL                              = 0x00000FFF;
  -    
  +
       /* As server, disallow session resumption on renegotiation */
       public static final int SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION = 0x00010000;
       /* If set, always create a new key when using tmp_dh parameters */
  @@ -124,11 +124,11 @@
        * (version 3.1) was announced in the client hello. Normally this is
        * forbidden to prevent version rollback attacks. */
       public static final int SSL_OP_TLS_ROLLBACK_BUG                 = 0x00800000;
  -    
  +
       public static final int SSL_OP_NO_SSLv2                         = 0x01000000;
       public static final int SSL_OP_NO_SSLv3                         = 0x02000000;
       public static final int SSL_OP_NO_TLSv1                         = 0x04000000;
  -    
  +
       /* The next flag deliberately changes the ciphertest, this is a check
        * for the PKCS#1 attack */
       public static final int SSL_OP_PKCS1_CHECK_1                    = 0x08000000;
  @@ -165,8 +165,8 @@
   
       /**
        * Writes a number of random bytes (currently 1024) to
  -     * file @filename which can be used to initialize the PRNG by calling
  -     * randLoad in a later session.
  +     * file <code>filename</code> which can be used to initialize the PRNG
  +     * by calling randLoad in a later session.
        * @param filename Filename to save the data
        */
       public static native boolean randSave(String filename);
  @@ -174,10 +174,10 @@
       /**
        * Creates random data to filename
        * @param filename Filename to save the data
  -     * @len   The length of random sequence in bytes
  -     * @base64 Output the data in Base64 encoded format
  +     * @param len The length of random sequence in bytes
  +     * @param base64 Output the data in Base64 encoded format
        */
  -    public static native boolean randMake(String filename, int length,
  +    public static native boolean randMake(String filename, int len,
                                             boolean base64);
   
       /**
  
  
  

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


Mime
View raw message