Author: mturk
Date: Wed Nov 14 05:21:53 2012
New Revision: 1409079
URL: http://svn.apache.org/viewvc?rev=1409079&view=rev
Log:
Trim trailing spaces - No functional change
Modified:
tomcat/native/branches/1.1.x/native/src/pool.c
tomcat/native/branches/1.1.x/native/src/ssl.c
tomcat/native/branches/1.1.x/native/src/sslcontext.c
tomcat/native/branches/1.1.x/native/src/sslinfo.c
tomcat/native/branches/1.1.x/native/src/sslnetwork.c
tomcat/native/branches/1.1.x/native/src/sslutils.c
Modified: tomcat/native/branches/1.1.x/native/src/pool.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/pool.c?rev=1409079&r1=1409078&r2=1409079&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/pool.c (original)
+++ tomcat/native/branches/1.1.x/native/src/pool.c Wed Nov 14 05:21:53 2012
@@ -179,7 +179,7 @@ static apr_status_t generic_pool_data_cl
if (data) {
JNIEnv *env;
tcn_get_java_env(&env);
-
+
if (!TCN_IS_NULL(env, cb->obj)) {
TCN_UNLOAD_CLASS(env, cb->obj);
}
@@ -204,7 +204,7 @@ TCN_IMPLEMENT_CALL(jint, Pool, dataSet)(
apr_pool_cleanup_run(p, old, generic_pool_data_cleanup);
}
if (data) {
- JNIEnv *e;
+ JNIEnv *e;
tcn_callback_t *cb = (tcn_callback_t *)malloc(sizeof(tcn_callback_t));
tcn_get_java_env(&e);
cb->obj = (*e)->NewGlobalRef(e, data);
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1409079&r1=1409078&r2=1409079&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Nov 14 05:21:53 2012
@@ -370,10 +370,10 @@ static struct CRYPTO_dynlock_value *ssl_
apr_pool_t *p;
apr_status_t rv;
- /*
+ /*
* We need a pool to allocate our mutex. Since we can't clear
* allocated memory from a pool, create a subpool that we can blow
- * away in the destruction callback.
+ * away in the destruction callback.
*/
rv = apr_pool_create(&p, dynlockpool);
if (rv != APR_SUCCESS) {
Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=1409079&r1=1409078&r2=1409079&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Wed Nov 14 05:21:53
2012
@@ -435,7 +435,7 @@ TCN_IMPLEMENT_CALL(void, SSLContext, set
X509_STORE_set_flags(c->store, 0);
}
else {
- /* XXX: See if this is fatal */
+ /* XXX: See if this is fatal */
}
}
@@ -508,7 +508,7 @@ static int ssl_load_pkcs12(tcn_ssl_ctxt_
PKCS12 *p12;
BIO *in;
tcn_pass_cb_t *cb_data = c->cb_data;
-
+
if ((in = BIO_new(BIO_s_file())) == 0)
return 0;
if (BIO_read_filename(in, file) <= 0) {
@@ -526,7 +526,7 @@ static int ssl_load_pkcs12(tcn_ssl_ctxt_
}
else {
if (!cb_data)
- cb_data = &tcn_password_callback;
+ cb_data = &tcn_password_callback;
len = SSL_password_callback(buff, PEM_BUFSIZE, 0, cb_data);
if (len < 0) {
/* Passpharse callback error */
@@ -544,7 +544,7 @@ cleanup:
PKCS12_free(p12);
BIO_free(in);
return rc;
-}
+}
TCN_IMPLEMENT_CALL(void, SSLContext, setRandom)(TCN_STDARGS, jlong ctx,
jstring file)
Modified: tomcat/native/branches/1.1.x/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslinfo.c?rev=1409079&r1=1409078&r2=1409079&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslinfo.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslinfo.c Wed Nov 14 05:21:53 2012
@@ -543,7 +543,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, getI
break;
default:
rv = APR_EINVAL;
- break;
+ break;
}
X509_free(xs);
}
Modified: tomcat/native/branches/1.1.x/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslnetwork.c?rev=1409079&r1=1409078&r2=1409079&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslnetwork.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslnetwork.c Wed Nov 14 05:21:53
2012
@@ -103,7 +103,7 @@ static apr_status_t ssl_cleanup(void *da
con->pollset = NULL;
if (con->ssl) {
SSL *ssl = con->ssl;
- con->ssl = NULL;
+ con->ssl = NULL;
ssl_smart_shutdown(ssl, con->shutdown_type);
SSL_free(ssl);
}
@@ -178,19 +178,19 @@ static apr_status_t wait_for_io_or_timeo
apr_os_sock_t sock;
if (!con->pollset)
- return APR_ENOPOLL;
+ return APR_ENOPOLL;
if (!con->sock)
- return APR_ENOTSOCK;
+ return APR_ENOTSOCK;
if (con->reneg_state == RENEG_ABORT) {
con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return APR_ECONNABORTED;
}
-
+
/* Check if the socket was already closed
- */
- apr_os_sock_get(&sock, con->sock);
+ */
+ apr_os_sock_get(&sock, con->sock);
if (sock == APR_INVALID_SOCKET)
- return APR_ENOTSOCK;
+ return APR_ENOTSOCK;
/* Figure out the the poll direction */
switch (for_what) {
@@ -352,7 +352,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, hand
}
if (!con->ssl)
return APR_ENOTSOCK;
-
+
/*
* Check for failed client authentication
*/
@@ -398,7 +398,7 @@ ssl_socket_recv(apr_socket_t *sock, char
apr_status_t os = apr_get_netos_error();
if (!con->ssl)
return os == APR_SUCCESS ? APR_ENOTSOCK : os;
-
+
i = SSL_get_error(con->ssl, s);
/* Special case if the "close notify" alert send by peer */
if (s == 0 && (con->ssl->shutdown & SSL_RECEIVED_SHUTDOWN)) {
@@ -461,7 +461,7 @@ ssl_socket_send(apr_socket_t *sock, cons
apr_status_t os = apr_get_netos_error();
if (!con->ssl)
return os == APR_SUCCESS ? APR_ENOTSOCK : os;
-
+
i = SSL_get_error(con->ssl, s);
switch (i) {
case SSL_ERROR_ZERO_RETURN:
@@ -559,8 +559,8 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, atta
if ((rv = apr_os_sock_get(&oss, s->sock)) != APR_SUCCESS)
return rv;
if (oss == APR_INVALID_SOCKET)
- return APR_ENOTSOCK;
-
+ return APR_ENOTSOCK;
+
if ((con = ssl_create(e, c, s->pool)) == NULL)
return APR_EGENERAL;
con->sock = s->sock;
@@ -595,15 +595,15 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
* ssl->state = SSL_ST_ACCEPT
* SSL_do_handshake()
*/
-
+
/* Toggle the renegotiation state to allow the new
* handshake to proceed.
*/
- con->reneg_state = RENEG_ALLOW;
+ con->reneg_state = RENEG_ALLOW;
retVal = SSL_renegotiate(con->ssl);
if (retVal <= 0)
return APR_EGENERAL;
-
+
retVal = SSL_do_handshake(con->ssl);
if (retVal <= 0)
return APR_EGENERAL;
@@ -629,7 +629,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
break;
}
con->reneg_state = RENEG_REJECT;
-
+
if (SSL_get_state(con->ssl) != SSL_ST_OK) {
return APR_EGENERAL;
}
Modified: tomcat/native/branches/1.1.x/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslutils.c?rev=1409079&r1=1409078&r2=1409079&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslutils.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslutils.c Wed Nov 14 05:21:53 2012
@@ -792,7 +792,7 @@ static void *apr_xrealloc(void *buf, siz
return newp;
}
-/* parses the ocsp url and updates the ocsp_urls and nocsp_urls variables
+/* parses the ocsp url and updates the ocsp_urls and nocsp_urls variables
returns 0 on success, 1 on failure */
static int parse_ocsp_url(unsigned char *asn1, char ***ocsp_urls,
int *nocsp_urls, apr_pool_t *p)
@@ -804,7 +804,7 @@ static int parse_ocsp_url(unsigned char
len = *++asn1;
asn1++;
new_nocsp_urls = *nocsp_urls+1;
- if ((new_ocsp_urls = apr_xrealloc(*ocsp_urls,*nocsp_urls,
new_nocsp_urls, p)) == NULL)
+ if ((new_ocsp_urls = apr_xrealloc(*ocsp_urls,*nocsp_urls,
new_nocsp_urls, p)) == NULL)
err = 1;
if (!err) {
*ocsp_urls = new_ocsp_urls;
@@ -841,7 +841,7 @@ static int parse_ASN1_OID(unsigned char
/* Parses an ASN1 Sequence. It is a recursive function, since if it finds a
sequence
- within the sequence it calls recursively itself. This function stops when
it finds
+ within the sequence it calls recursively itself. This function stops when
it finds
the end of the ASN1 sequence (marked by '\0'), so if there are other
sequences within
the same sequence the while loop parses the sequences */
@@ -916,7 +916,7 @@ static int add_ocsp_cert(OCSP_REQUEST **
}
-/* Creates the APR socket and connect to the hostname. Returns the
+/* Creates the APR socket and connect to the hostname. Returns the
socket or NULL if there is an error.
*/
static apr_socket_t *make_socket(char *hostname, int port, apr_pool_t *mp)
@@ -1243,7 +1243,7 @@ static int ssl_ocsp_request(X509 *cert,
ocsp_urls = decode_OCSP_url(os, p);
}
- /* if we find the extensions and we can parse it check
+ /* if we find the extensions and we can parse it check
the ocsp status. Otherwise, return OCSP_STATUS_UNKNOWN */
if (ocsp_urls != NULL) {
OCSP_RESPONSE *resp;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
