You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/12/10 14:01:31 UTC
[tomcat] branch master updated: Align with changes made directly in
Tomcat Native
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c400239 Align with changes made directly in Tomcat Native
c400239 is described below
commit c400239cb17d82f8e10f12e40881293b7d2d70b9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 10 14:00:22 2020 +0000
Align with changes made directly in Tomcat Native
---
java/org/apache/tomcat/jni/Address.java | 5 +++--
java/org/apache/tomcat/jni/Library.java | 8 ++++++++
java/org/apache/tomcat/jni/Socket.java | 1 +
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Address.java b/java/org/apache/tomcat/jni/Address.java
index 87eba9e..acac800 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -46,8 +46,9 @@ public class Address {
/**
* Create apr_sockaddr_t from hostname, address family, and port.
- * @param hostname The hostname or numeric address string to resolve/parse, or
- * NULL to build an address that corresponds to 0.0.0.0 or ::
+ * @param hostname The hostname or numeric address string to resolve/parse, the
+ * path of the Unix Domain Socket, or NULL to build an address
+ * that corresponds to 0.0.0.0 or ::
* @param family The address family to use, or APR_UNSPEC if the system should
* decide.
* @param port The port number.
diff --git a/java/org/apache/tomcat/jni/Library.java b/java/org/apache/tomcat/jni/Library.java
index c6c1398..a9849d3 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -177,6 +177,12 @@ public final class Library {
/* Is the O_NONBLOCK flag inherited from listening sockets?
*/
public static boolean APR_O_NONBLOCK_INHERITED = false;
+ /* Poll operations are interruptable by apr_pollset_wakeup().
+ */
+ public static boolean APR_POLLSET_WAKEABLE = false;
+ /* Support for Unix Domain Sockets.
+ */
+ public static boolean APR_HAVE_UNIX = false;
public static int APR_SIZEOF_VOIDP;
@@ -244,6 +250,8 @@ public final class Library {
APR_CHARSET_EBCDIC = has(18);
APR_TCP_NODELAY_INHERITED = has(19);
APR_O_NONBLOCK_INHERITED = has(20);
+ APR_POLLSET_WAKEABLE = has(21);
+ APR_HAVE_UNIX = has(22);
if (APR_MAJOR_VERSION < 1) {
throw new UnsatisfiedLinkError("Unsupported APR Version (" +
aprVersionString() + ")");
diff --git a/java/org/apache/tomcat/jni/Socket.java b/java/org/apache/tomcat/jni/Socket.java
index bfed4e2..6d64ec0 100644
--- a/java/org/apache/tomcat/jni/Socket.java
+++ b/java/org/apache/tomcat/jni/Socket.java
@@ -85,6 +85,7 @@ public class Socket {
public static final int APR_UNSPEC = 0;
public static final int APR_INET = 1;
public static final int APR_INET6 = 2;
+ public static final int APR_UNIX = 3;
public static final int APR_PROTO_TCP = 6; /** TCP */
public static final int APR_PROTO_UDP = 17; /** UDP */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org