You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mi...@apache.org on 2023/06/26 16:04:47 UTC
[tomcat-native] branch 1.2.x updated: Trim trailing whitespace
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.2.x by this push:
new d108b0288 Trim trailing whitespace
d108b0288 is described below
commit d108b02885cea1d46948939883bfe02da464fdb1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jun 26 18:00:16 2023 +0200
Trim trailing whitespace
---
native/src/address.c | 2 +-
native/src/info.c | 2 +-
native/src/poll.c | 2 +-
native/src/sslconf.c | 2 +-
native/src/sslcontext.c | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/native/src/address.c b/native/src/address.c
index 87a877178..af43122d6 100644
--- a/native/src/address.c
+++ b/native/src/address.c
@@ -46,7 +46,7 @@ TCN_IMPLEMENT_CALL(jlong, Address, info)(TCN_STDARGS,
J2S(hostname), f, (apr_port_t)port,
(apr_int32_t)flags, p), sa);
sl = sa;
- /*
+ /*
* apr_sockaddr_info_get may return several address so this is not
* go to work in some cases (but as least it works for Linux)
* XXX: with AP_ENABLE_V4_MAPPED it is going to work otherwise it won't.
diff --git a/native/src/info.c b/native/src/info.c
index 4734e542b..01d1ae4c2 100644
--- a/native/src/info.c
+++ b/native/src/info.c
@@ -140,7 +140,7 @@ apr_status_t tcn_load_finfo_class(JNIEnv *e, jclass finfo)
GET_FINFO_S(fname);
GET_FINFO_S(name);
GET_FINFO_J(filehand);
-
+
finfo_class_init = (*e)->GetMethodID(e, finfo,
"<init>", "()V");
if (finfo_class_init == NULL)
diff --git a/native/src/poll.c b/native/src/poll.c
index 4414ec821..f5f2992c9 100644
--- a/native/src/poll.c
+++ b/native/src/poll.c
@@ -403,7 +403,7 @@ TCN_IMPLEMENT_CALL(jint, Poll, poll)(TCN_STDARGS, jlong pollset,
array or as multiple pairs depending on implementation. On OSX at
least, multiple pairs have been observed. In this case do not try
and remove socket from the pollset for a second time else a crash
- will result. */
+ will result. */
if (remove) {
if (s->pe) {
apr_pollset_remove(p->pollset, fd);
diff --git a/native/src/sslconf.c b/native/src/sslconf.c
index e2ece6fe5..6ff028b66 100644
--- a/native/src/sslconf.c
+++ b/native/src/sslconf.c
@@ -265,7 +265,7 @@ TCN_IMPLEMENT_CALL(jint, SSLConf, apply)(TCN_STDARGS, jlong cctx,
c->no_ocsp_check = 1;
TCN_FREE_CSTRING(cmd);
TCN_FREE_CSTRING(value);
- return 1;
+ return 1;
}
SSL_ERR_clear();
rc = SSL_CONF_cmd(c->cctx, J2S(cmd), buf != NULL ? buf : J2S(value));
diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index c0541bd72..afec601c8 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -142,7 +142,7 @@ int ssl_callback_ClientHello(SSL *ssl, int *al, void *arg)
const unsigned char *pos;
size_t len, remaining;
tcn_ssl_ctxt_t *c = (tcn_ssl_ctxt_t *) arg;
-
+
(*javavm)->AttachCurrentThread(javavm, (void **)&env, NULL);
// Continue only if the static method exists
if (sni_java_callback == NULL) {
@@ -162,7 +162,7 @@ int ssl_callback_ClientHello(SSL *ssl, int *al, void *arg)
*/
if (!SSL_client_hello_get0_ext(ssl, TLSEXT_TYPE_server_name, &pos,
&remaining)
- || remaining <= 2)
+ || remaining <= 2)
goto give_up;
/* Extract the length of the supplied list of names. */
@@ -222,7 +222,7 @@ give_up:
SSL_set_session_id_context(ssl, &(c->context_id[0]), sizeof c->context_id);
}
}
-
+
}
return SSL_CLIENT_HELLO_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org