Re: Looking for mentor
On 17/04/2016 19:27, Abdessamed MANSOURI wrote: > Thank you so much, its so nice from you :) Another idea for somewhere to get started... I recently fixed bug 59219. That included a stand-alone test case but I didn't port that test case into the Tomcat unit tests. Porting that test case could be a great place to start getting involved. Mark > > 2016-04-17 15:36 GMT+01:00 Mark Thomas : > >> On 17/04/2016 11:34, Abdessamed MANSOURI wrote: >>> Guys, inside Tomcat source, there's many packages (Catalina, Jasper, >>> Tomcat, Juli, Coyote) what these packages stand for?? ( i want to >>> understand basic Tomcat architecture) :) >> >> It is for Tomcat 6 and while the detail has changed the high-level >> structure hasn't. >> >> https://www.packtpub.com/networking-and-servers/tomcat-6-developers-guide >> >> Catalina - The Servlet engine >> Coyote - The HTTP, HTTP/2 and AJP I/O code >> EL - The UEL implementation >> Jasper - The JSP engine >> JULI - Internal logging framework >> Tomcat - Various utility packages, low-level I/O code and the >> WebSocket implementation >> Naming - JNDI code >> >> Mark >> >> >>> >>> Thank you all. >>> >>> 2016-04-16 22:46 GMT+01:00 Abdessamed MANSOURI : >>> Martin, i just have 2 computers (laptop and desktop), i don't use >> desktop too much, so in past i tried many JVM implementations, i wanted to see performance for each one, but today, when i launched unit tests, i >> forget about changing it to OpenJDK, so at the end i figured that i used J9 :) Mark, okey, i will try my best :) Thank you all for your time. 2016-04-16 20:44 GMT+01:00 Mark Thomas : > On 16/04/2016 20:34, Abdessamed MANSOURI wrote: >> Thank you for your response and your time, i checkouted svn trunk and > built >> Tomcat successfully, its works fine, i also run ant test, for unit > testing, >> but it ended with some errors (i've used IBM J9), now i completed this >> step, what do you suggests me to do now?? :) > > You could investigate those unit test failures to see why they >> happened. > > You could look at one of the open bugs or enhancement requests and try > producing a patch. Some possible starting point are: > - https://bz.apache.org/bugzilla/show_bug.cgi?id=57892 > - https://bz.apache.org/bugzilla/show_bug.cgi?id=44787 > - https://bz.apache.org/bugzilla/show_bug.cgi?id=47214 > - https://bz.apache.org/bugzilla/show_bug.cgi?id=52952 > >> I can't find Tomcat on Jira, why?? :) > > Because the Tomcat project uses Bugzilla, not Jira. > > Mark > > >> >> Thank you for your time again. >> >> 2016-04-16 16:25 GMT+01:00 Mark Thomas : >> >>> On 15/04/2016 17:59, Abdessamed MANSOURI wrote: Hello all, I'm newcomer and i want to contribute to Tomcat developement, i have > some free time (alots of time), so i want to be useful in this world >> better >>> than sleeping all the day, so i'm looking for applying Apache mentoring >>> program, i'm not guru in Java but not totaly a newbie, so i want to try all >> my >>> best to help you guys, who want to be my mentor?? >>> >>> Welcome to the Tomcat development community. Feel free to ask any >>> questions you have on this list. >>> Note : i still student, but i'm not looking to do Tomcat as my final project (i already have a final project), i wan't to help you (as >> much >>> as i can). Thank you all for your time. >>> >>> The first step is to make sure you can build Tomcat locally. Follow >> the >>> instructions in [1] to checkout the latest Tomcat source and and >> build > it. >>> >>> Note that the URL you'll need to checkout Tomcat trunk is: >>> https://svn.apache.org/viewvc/tomcat/trunk >>> >>> If you have any questions, just ask. >>> >>> Mark >>> >>> >>> [1] > https://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?view=markup >>> >>> >>> - >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >>> For additional commands, e-mail: dev-h...@tomcat.apache.org >>> >>> >> > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > >>> >> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e
svn commit: r1739862 - in /tomcat/trunk: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java java/org/apache/catalina/tribes/Channel.java java/org/apache/catalina/tribes/group/GroupChannel.java weba
Author: kfujino
Date: Tue Apr 19 08:34:45 2016
New Revision: 1739862
URL: http://svn.apache.org/viewvc?rev=1739862&view=rev
Log:
Add name to channel in order to identify channels.
In tomcat cluster environment, it is set the cluster name + "-Channel" as
default value.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1739862&r1=1739861&r2=1739862&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Tue Apr
19 08:34:45 2016
@@ -533,6 +533,7 @@ public class SimpleTcpCluster extends Li
registerClusterValve();
channel.addMembershipListener(this);
channel.addChannelListener(this);
+channel.setName(getClusterName() + "-Channel");
channel.start(channelStartOptions);
if (clusterDeployer != null) clusterDeployer.start();
registerMember(channel.getLocalMember(false));
Modified: tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/Channel.java?rev=1739862&r1=1739861&r2=1739862&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/Channel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/Channel.java Tue Apr 19
08:34:45 2016
@@ -357,5 +357,16 @@ public interface Channel {
*/
public Member getMember(Member mbr);
+/**
+ * Return the name of this channel.
+ * @return channel name
+ */
+public String getName();
+
+/**
+ * Set the name of this channel
+ * @param name
+ */
+public void setName(String name);
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1739862&r1=1739861&r2=1739862&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Tue
Apr 19 08:34:45 2016
@@ -106,6 +106,11 @@ public class GroupChannel extends Channe
protected boolean optionCheck = false;
/**
+ * the name of this channel.
+ */
+protected String name = null;
+
+/**
* Creates a GroupChannel. This constructor will also
* add the first interceptor in the GroupChannel.
* The first interceptor is always the channel itself.
@@ -621,6 +626,16 @@ public class GroupChannel extends Channe
return heartbeatSleeptime;
}
+@Override
+public String getName() {
+return name;
+}
+
+@Override
+public void setName(String name) {
+this.name = name;
+}
+
/**
*
* Title: Interceptor Iterator
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1739862&r1=1739861&r2=1739862&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 19 08:34:45 2016
@@ -265,6 +265,11 @@
Add get/set method for the channel that is related to each Channel
services. (kfujino)
+
+Add name to channel in order to identify channels. In tomcat cluster
+environment, it is set the cluster name + "-Channel" as default value.
+(kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1739863 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java java/org/apache/catalina/tribes/Channel.java java/org/apache/catalina/tribes/group/GroupChannel.j
Author: kfujino
Date: Tue Apr 19 08:37:02 2016
New Revision: 1739863
URL: http://svn.apache.org/viewvc?rev=1739863&view=rev
Log:
Add name to channel in order to identify channels.
In tomcat cluster environment, it is set the cluster name + "-Channel" as
default value.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1739863&r1=1739862&r2=1739863&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Tue Apr 19 08:37:02 2016
@@ -533,6 +533,7 @@ public class SimpleTcpCluster extends Li
registerClusterValve();
channel.addMembershipListener(this);
channel.addChannelListener(this);
+channel.setName(getClusterName() + "-Channel");
channel.start(channelStartOptions);
if (clusterDeployer != null) clusterDeployer.start();
registerMember(channel.getLocalMember(false));
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java?rev=1739863&r1=1739862&r2=1739863&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Channel.java Tue Apr
19 08:37:02 2016
@@ -357,5 +357,16 @@ public interface Channel {
*/
public Member getMember(Member mbr);
+/**
+ * Return the name of this channel.
+ * @return channel name
+ */
+public String getName();
+
+/**
+ * Set the name of this channel
+ * @param name
+ */
+public void setName(String name);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1739863&r1=1739862&r2=1739863&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 19 08:37:02 2016
@@ -106,6 +106,11 @@ public class GroupChannel extends Channe
protected boolean optionCheck = false;
/**
+ * the name of this channel.
+ */
+protected String name = null;
+
+/**
* Creates a GroupChannel. This constructor will also
* add the first interceptor in the GroupChannel.
* The first interceptor is always the channel itself.
@@ -621,6 +626,16 @@ public class GroupChannel extends Channe
return heartbeatSleeptime;
}
+@Override
+public String getName() {
+return name;
+}
+
+@Override
+public void setName(String name) {
+this.name = name;
+}
+
/**
*
* Title: Interceptor Iterator
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1739863&r1=1739862&r2=1739863&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Apr 19 08:37:02 2016
@@ -268,6 +268,11 @@
Add get/set method for the channel that is related to each Channel
services. (kfujino)
+
+Add name to channel in order to identify channels. In tomcat cluster
+environment, it is set the cluster name + "-Channel" as default value.
+(kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1739864 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java java/org/apache/catalina/tribes/group/GroupChannel.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Apr 19 08:39:47 2016
New Revision: 1739864
URL: http://svn.apache.org/viewvc?rev=1739864&view=rev
Log:
Add name to channel in order to identify channels.
In tomcat cluster environment, it is set the cluster name + "-Channel" as
default value.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1739864&r1=1739863&r2=1739864&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Tue Apr 19 08:39:47 2016
@@ -538,6 +538,8 @@ public class SimpleTcpCluster extends Li
registerClusterValve();
channel.addMembershipListener(this);
channel.addChannelListener(this);
+if (channel instanceof GroupChannel)
+((GroupChannel)channel).setName(getClusterName() + "-Channel");
channel.start(channelStartOptions);
if (clusterDeployer != null) clusterDeployer.start();
registerMember(channel.getLocalMember(false));
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1739864&r1=1739863&r2=1739864&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 19 08:39:47 2016
@@ -107,6 +107,11 @@ public class GroupChannel extends Channe
protected boolean optionCheck = false;
/**
+ * the name of this channel.
+ */
+protected String name = null;
+
+/**
* Creates a GroupChannel. This constructor will also
* add the first interceptor in the GroupChannel.
* The first interceptor is always the channel itself.
@@ -623,6 +628,14 @@ public class GroupChannel extends Channe
return heartbeatSleeptime;
}
+public String getName() {
+return name;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+
/**
*
* Title: Interceptor Iterator
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1739864&r1=1739863&r2=1739864&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Apr 19 08:39:47 2016
@@ -220,6 +220,11 @@
Add get/set method for the channel that is related to each Channel
services. (kfujino)
+
+Add name to channel in order to identify channels. In tomcat cluster
+environment, it is set the cluster name + "-Channel" as default value.
+(kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1739865 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java java/org/apache/catalina/tribes/group/GroupChannel.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Apr 19 08:42:17 2016
New Revision: 1739865
URL: http://svn.apache.org/viewvc?rev=1739865&view=rev
Log:
Add name to channel in order to identify channels.
In tomcat cluster environment, it is set the cluster name + "-Channel" as
default value.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1739865&r1=1739864&r2=1739865&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Tue Apr 19 08:42:17 2016
@@ -684,6 +684,8 @@ public class SimpleTcpCluster extends Li
registerClusterValve();
channel.addMembershipListener(this);
channel.addChannelListener(this);
+if (channel instanceof GroupChannel)
+((GroupChannel)channel).setName(getClusterName() + "-Channel");
channel.start(channelStartOptions);
if (clusterDeployer != null) clusterDeployer.start();
registerMember(channel.getLocalMember(false));
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1739865&r1=1739864&r2=1739865&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 19 08:42:17 2016
@@ -105,6 +105,11 @@ public class GroupChannel extends Channe
protected boolean optionCheck = false;
/**
+ * the name of this channel.
+ */
+protected String name = null;
+
+/**
* Creates a GroupChannel. This constructor will also
* add the first interceptor in the GroupChannel.
* The first interceptor is always the channel itself.
@@ -616,6 +621,14 @@ public class GroupChannel extends Channe
return heartbeatSleeptime;
}
+public String getName() {
+return name;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+
/**
*
* Title: Interceptor Iterator
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1739865&r1=1739864&r2=1739865&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 19 08:42:17 2016
@@ -117,6 +117,11 @@
Add get/set method for the channel that is related to each Channel
services. (kfujino)
+
+Add name to channel in order to identify channels. In tomcat cluster
+environment, it is set the cluster name + "-Channel" as default value.
+(kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1739875 - in /tomcat/native/trunk: native/src/sslutils.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Tue Apr 19 09:15:43 2016
New Revision: 1739875
URL: http://svn.apache.org/viewvc?rev=1739875&view=rev
Log:
Remove the explicit CRL check when verifying
certificates. The checks were already part
of the internal certification verification
since OpenSSL 0.9.7.
Backport from mod_ssl.
This fixes the remaining incompatibility with
recent OpenSSL 1.1.0 API changes.
Modified:
tomcat/native/trunk/native/src/sslutils.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1739875&r1=1739874&r2=1739875&view=diff
==
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/sslutils.c Tue Apr 19 09:15:43 2016
@@ -287,171 +287,6 @@ int SSL_CTX_use_certificate_chain(SSL_CT
return n;
}
-static int ssl_X509_STORE_lookup(X509_STORE *store, int yype,
- X509_NAME *name, X509_OBJECT **obj)
-{
-X509_STORE_CTX *ctx;
-int rc;
-
-ctx = X509_STORE_CTX_new();
-X509_STORE_CTX_init(ctx, store, NULL, NULL);
-#if OPENSSL_VERSION_NUMBER < 0x1010L
-rc = X509_STORE_get_by_subject(ctx, yype, name, *obj);
-#else
-*obj = X509_STORE_get_X509_by_subject(ctx, yype, name);
-if (*obj == NULL) {
-rc = -1;
-}
-#endif
-X509_STORE_CTX_cleanup(ctx);
-X509_STORE_CTX_free(ctx);
-return rc;
-}
-
-static int ssl_verify_CRL(int ok, X509_STORE_CTX *ctx, tcn_ssl_conn_t *con)
-{
-X509_OBJECT *obj;
-X509_NAME *subject, *issuer;
-X509 *cert;
-X509_CRL *crl;
-EVP_PKEY *pubkey;
-int i, n, rc;
-
-/*
- * Determine certificate ingredients in advance
- */
-cert= X509_STORE_CTX_get_current_cert(ctx);
-subject = X509_get_subject_name(cert);
-issuer = X509_get_issuer_name(cert);
-
-/*
- * OpenSSL provides the general mechanism to deal with CRLs but does not
- * use them automatically when verifying certificates, so we do it
- * explicitly here. We will check the CRL for the currently checked
- * certificate, if there is such a CRL in the store.
- *
- * We come through this procedure for each certificate in the certificate
- * chain, starting with the root-CA's certificate. At each step we've to
- * both verify the signature on the CRL (to make sure it's a valid CRL)
- * and it's revocation list (to make sure the current certificate isn't
- * revoked). But because to check the signature on the CRL we need the
- * public key of the issuing CA certificate (which was already processed
- * one round before), we've a little problem. But we can both solve it and
- * at the same time optimize the processing by using the following
- * verification scheme (idea and code snippets borrowed from the GLOBUS
- * project):
- *
- * 1. We'll check the signature of a CRL in each step when we find a CRL
- *through the _subject_ name of the current certificate. This CRL
- *itself will be needed the first time in the next round, of course.
- *But we do the signature processing one round before this where the
- *public key of the CA is available.
- *
- * 2. We'll check the revocation list of a CRL in each step when
- *we find a CRL through the _issuer_ name of the current certificate.
- *This CRLs signature was then already verified one round before.
- *
- * This verification scheme allows a CA to revoke its own certificate as
- * well, of course.
- */
-
-/*
- * Try to retrieve a CRL corresponding to the _subject_ of
- * the current certificate in order to verify it's integrity.
- */
-#if OPENSSL_VERSION_NUMBER < 0x1010L
-obj = OPENSSL_malloc(sizeof (*obj));
-memset((char *)obj, 0, sizeof(*obj));
-#endif
-rc = ssl_X509_STORE_lookup(con->ctx->crl,
- X509_LU_CRL, subject, &obj);
-/* XXX obj is now OPAQUE */
-crl = obj->data.crl;
-
-if ((rc > 0) && crl) {
-/*
- * Log information about CRL
- * (A little bit complicated because of ASN.1 and BIOs...)
- */
-/*
- * Verify the signature on this CRL
- */
-pubkey = X509_get_pubkey(cert);
-rc = X509_CRL_verify(crl, pubkey);
-/* Only refcounted in OpenSSL */
-if (pubkey)
-EVP_PKEY_free(pubkey);
-if (rc <= 0) {
-/* TODO: Log Invalid signature on CRL */
-X509_STORE_CTX_set_error(ctx, X509_V_ERR_CRL_SIGNATURE_FAILURE);
-X509_OBJECT_free(obj);
-return 0;
-}
-
-/*
- * Check date of CRL to make sure it's not expired
- */
-i = X509_cmp_current_time(X509_CRL_get_nextUpdate(crl));
-
-if (i == 0) {
-/* TODO: Log Found CR
Re: Time for tc-native 1.2.6
Am 18.04.2016 um 18:13 schrieb Rainer Jung: Am 18.04.2016 um 17:28 schrieb jean-frederic clere: On 04/18/2016 05:03 PM, Rainer Jung wrote: Hi Mark, Am 18.04.2016 um 16:37 schrieb Mark Thomas: I'd like to get the next tc-native release out before the end of the month so the next round of Tomcat releases can pick it up - particularly the cert chain from Java keystore fix. I'm intending to tag in ~24 hours. Please reply if you need me to delay. Current code status: a) I tried to keep compatibility with OpenSSL 1.0.2 all the time. Any breaks would be unintended. At least things compiled here. More eyes and tests for the changes applied since 1.2.5 are very welcome. b) it will not compile with against latest OpenSSL 1.1.0 beta, because to stay compatible with 1.1.0 head we had to use more recent OpenSSL functions introduced after the last beta c) it will not compile with the latest OpenSSL 1.1.0 snapshot either, because I haven't yet found a solution to an API change only introduced last week I'll see whether I find a fix for c) so that the release would at least work with a current OpenSSL 1.1.0 snapshot. Even if not, I think you can release, because OpenSSL 1.1.0 head still doesn't seem to be API stable, so we are not at the end of changes anyhows. Background infoRecently there was another opaqueness change in OpenSSL 1.1.0 head. There's one incompatibility remaining between tcnative head and OpenSSL 1.1.0 head for which I didn't find an immediate replacement. So compiling against latest 1.1.0 snapshots will result in a compilation error in ssl_verify_CRL(). The CRL handling code is very different from what we can find in OpenSSL example/apps code and it could well be, that we should replace a bigger part of that code with some pre-cooked cert validation function (call) in OpenSSL. Is mod_ssl also affected by those API changes? Not 2.4, but our code seems to go back to 2.2. The code has significantly changed for 2.4 in r1165056 which is likely the change we will adopt as well. Done in r1739875. There's lots of changes in the OCSP code in mod_ssl we might want to take over. I don't plan to work on this (or any other change) before 1.2.6. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1739877 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/ java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina/tribes/membership/ java/org/apache/catalina
Author: kfujino
Date: Tue Apr 19 09:23:56 2016
New Revision: 1739877
URL: http://svn.apache.org/viewvc?rev=1739877&view=rev
Log:
Add the channel name to the thread which is invoked by channel services in
order to identify the associated channel.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1739877&r1=1739876&r2=1739877&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Tue
Apr 19 09:23:56 2016
@@ -695,7 +695,9 @@ public class GroupChannel extends Channe
public HeartbeatThread(GroupChannel channel, long sleepTime) {
super();
this.setPriority(MIN_PRIORITY);
-setName("GroupChannel-Heartbeat-"+inc());
+String channelName = "";
+if (channel.getName() != null) channelName = "[" +
channel.getName() + "]";
+setName("GroupChannel-Heartbeat" + channelName + "-" +inc());
setDaemon(true);
this.channel = channel;
this.sleepTime = sleepTime;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1739877&r1=1739876&r2=1739877&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Tue Apr 19 09:23:56 2016
@@ -110,9 +110,11 @@ public class MessageDispatchInterceptor
if (run) {
return;
}
+String channelName = "";
+if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads,
keepAliveTime,
TimeUnit.MILLISECONDS,
-new
TcclThreadFactory("MessageDispatchInterceptor.MessageDispatchThread"));
+new
TcclThreadFactory("MessageDispatchInterceptor.MessageDispatchThread" +
channelName));
run = true;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=1739877&r1=1739876&r2=1739877&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
Tue Apr 19 09:23:56 2016
@@ -69,7 +69,9 @@ public class TcpPingInterceptor extends
if ( thread == null && useThread) {
thread = new PingThread();
thread.setDaemon(true);
-thread.setName("TcpPingInterceptor.PingThread-"+cnt.addAndGet(1));
+String channelName = "";
+if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
+thread.setName("TcpPingInterceptor.PingThread" + channelName
+"-"+cnt.addAndGet(1));
thread.start();
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1739877&r1=1739876&r2=1739877&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Tue Apr 19 09:23:56 2016
@@ -545,7 +545,9 @@ public class McastServiceImpl {
int errorCounter = 0;
public ReceiverThread() {
super();
-setName("Tribes-MembershipReceiver");
+
svn commit: r1739878 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/tribes/group/ java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina/tribes/membership/ java/org/apache/
Author: kfujino
Date: Tue Apr 19 09:25:29 2016
New Revision: 1739878
URL: http://svn.apache.org/viewvc?rev=1739878&view=rev
Log:
Add the channel name to the thread which is invoked by channel services in
order to identify the associated channel.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1739878&r1=1739877&r2=1739878&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 19 09:25:29 2016
@@ -695,7 +695,9 @@ public class GroupChannel extends Channe
public HeartbeatThread(GroupChannel channel, long sleepTime) {
super();
this.setPriority(MIN_PRIORITY);
-setName("GroupChannel-Heartbeat-"+inc());
+String channelName = "";
+if (channel.getName() != null) channelName = "[" +
channel.getName() + "]";
+setName("GroupChannel-Heartbeat" + channelName + "-" +inc());
setDaemon(true);
this.channel = channel;
this.sleepTime = sleepTime;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1739878&r1=1739877&r2=1739878&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Tue Apr 19 09:25:29 2016
@@ -110,9 +110,11 @@ public class MessageDispatchInterceptor
if (run) {
return;
}
+String channelName = "";
+if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads,
keepAliveTime,
TimeUnit.MILLISECONDS,
-new
TcclThreadFactory("MessageDispatchInterceptor.MessageDispatchThread"));
+new
TcclThreadFactory("MessageDispatchInterceptor.MessageDispatchThread" +
channelName));
run = true;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=1739878&r1=1739877&r2=1739878&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
Tue Apr 19 09:25:29 2016
@@ -69,7 +69,9 @@ public class TcpPingInterceptor extends
if ( thread == null && useThread) {
thread = new PingThread();
thread.setDaemon(true);
-thread.setName("TcpPingInterceptor.PingThread-"+cnt.addAndGet(1));
+String channelName = "";
+if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
+thread.setName("TcpPingInterceptor.PingThread" + channelName
+"-"+cnt.addAndGet(1));
thread.start();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1739878&r1=1739877&r2=1739878&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Tue Apr 19 09:25:29 2016
@@
svn commit: r1739879 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/group/ java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina/tribes/membership/ java/org/apache/
Author: kfujino
Date: Tue Apr 19 09:27:01 2016
New Revision: 1739879
URL: http://svn.apache.org/viewvc?rev=1739879&view=rev
Log:
Add the channel name to the thread which is invoked by channel services in
order to identify the associated channel.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1739879&r1=1739878&r2=1739879&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 19 09:27:01 2016
@@ -695,7 +695,9 @@ public class GroupChannel extends Channe
public HeartbeatThread(GroupChannel channel, long sleepTime) {
super();
this.setPriority(MIN_PRIORITY);
-setName("GroupChannel-Heartbeat-"+inc());
+String channelName = "";
+if (channel.getName() != null) channelName = "[" +
channel.getName() + "]";
+setName("GroupChannel-Heartbeat" + channelName + "-" +inc());
setDaemon(true);
this.channel = channel;
this.sleepTime = sleepTime;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1739879&r1=1739878&r2=1739879&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Tue Apr 19 09:27:01 2016
@@ -27,6 +27,7 @@ import org.apache.catalina.tribes.ErrorH
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.UniqueId;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.group.InterceptorPayload;
import org.apache.catalina.tribes.util.ExecutorFactory;
import org.apache.catalina.tribes.util.StringManager;
@@ -134,9 +135,13 @@ public class MessageDispatchInterceptor
if (run) {
return;
}
+String channelName = "";
+if (getChannel() instanceof GroupChannel &&
((GroupChannel)getChannel()).getName() != null) {
+channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
+}
executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads,
keepAliveTime,
TimeUnit.MILLISECONDS,
-new
TcclThreadFactory("MessageDispatchInterceptor.MessageDispatchThread"));
+new
TcclThreadFactory("MessageDispatchInterceptor.MessageDispatchThread" +
channelName));
run = true;
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=1739879&r1=1739878&r2=1739879&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
Tue Apr 19 09:27:01 2016
@@ -26,6 +26,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.io.ChannelData;
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.util.StringManager;
@@ -70,7 +71,12 @@ public class TcpPingInterceptor extends
if ( thread == null && useThread) {
thread = new PingT
svn commit: r1739880 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/group/ java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina/tribes/membership/ java/org/apache/
Author: kfujino
Date: Tue Apr 19 09:28:50 2016
New Revision: 1739880
URL: http://svn.apache.org/viewvc?rev=1739880&view=rev
Log:
Add the channel name to the thread which is invoked by channel services in
order to identify the associated channel.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 19 09:28:50 2016
@@ -688,7 +688,9 @@ public class GroupChannel extends Channe
public HeartbeatThread(GroupChannel channel, long sleepTime) {
super();
this.setPriority(MIN_PRIORITY);
-setName("GroupChannel-Heartbeat-"+inc());
+String channelName = "";
+if (channel.getName() != null) channelName = "[" +
channel.getName() + "]";
+setName("GroupChannel-Heartbeat" + channelName + "-" +inc());
setDaemon(true);
this.channel = channel;
this.sleepTime = sleepTime;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
Tue Apr 19 09:28:50 2016
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.group.InterceptorPayload;
import org.apache.catalina.tribes.transport.bio.util.LinkObject;
import org.apache.catalina.tribes.util.ExecutorFactory;
@@ -82,9 +83,13 @@ public class MessageDispatch15Intercepto
@Override
public void startQueue() {
if ( run ) return;
+String channelName = "";
+if (getChannel() instanceof GroupChannel &&
((GroupChannel)getChannel()).getName() != null) {
+channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
+}
executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads,
keepAliveTime, TimeUnit.MILLISECONDS,
-new
TcclThreadFactory("MessageDispatch15Interceptor.MessageDispatchThread"));
+new
TcclThreadFactory("MessageDispatch15Interceptor.MessageDispatchThread" +
channelName));
run = true;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Tue Apr 19 09:28:50 2016
@@ -23,6 +23,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.UniqueId;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.group.InterceptorPayload;
import org.apache.catalina.tribes.transport.bio.util.FastQueue;
import org.apache.catalina.tribes.transpo
Re: Time for tc-native 1.2.6
I just now saw, that there's again an API break for OpenSSL 1.1.0. I'll try to fix that during the next hour. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Adding tomcat to HTTP/2 implementation list
On 19/04/2016 03:53, Huxing Zhang wrote: > Hi, > > I am planing to add tomcat to the list of known HTTP/2 implementation: > https://github.com/http2/http2-spec/wiki/Implementations > > Before committing, I would like to confirm with you guys: > > Name: Apache Tomcat 8.5+(http://tomcat.apache.org/) > Language: Java > role(s): Server > negotiation(s): ALPN, Upgrade > protocol id(s): h2, h2c > > The main concern is whether direct negotiation is supported or not. > IMO the direct negotiation is not supported. > > Is that information correct? Yes, that is correct. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1739889 - in /tomcat/native/trunk/native: include/ssl_private.h src/ssl.c
Author: rjung
Date: Tue Apr 19 10:08:10 2016
New Revision: 1739889
URL: http://svn.apache.org/viewvc?rev=1739889&view=rev
Log:
Support for OpenSSL 1.1.0:
- get_rfc_prime_... symbols have been renamed.
Modified:
tomcat/native/trunk/native/include/ssl_private.h
tomcat/native/trunk/native/src/ssl.c
Modified: tomcat/native/trunk/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1739889&r1=1739888&r2=1739889&view=diff
==
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Tue Apr 19 10:08:10 2016
@@ -209,6 +209,14 @@
#define OpenSSL_version_num SSLeay
#define OPENSSL_VERSION SSLEAY_VERSION
#define OPENSSL_malloc_init CRYPTO_malloc_init
+#define BN_get_rfc2409_prime_768 get_rfc2409_prime_768
+#define BN_get_rfc2409_prime_1024get_rfc2409_prime_1024
+#define BN_get_rfc3526_prime_1536get_rfc3526_prime_1536
+#define BN_get_rfc3526_prime_2048get_rfc3526_prime_2048
+#define BN_get_rfc3526_prime_3072get_rfc3526_prime_3072
+#define BN_get_rfc3526_prime_4096get_rfc3526_prime_4096
+#define BN_get_rfc3526_prime_6144get_rfc3526_prime_6144
+#define BN_get_rfc3526_prime_8192get_rfc3526_prime_8192
#define BIO_get_init(x) (x->init)
#define BIO_set_init(x,v)(x->init=v)
#define BIO_get_data(x) (x->ptr)
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1739889&r1=1739888&r2=1739889&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Tue Apr 19 10:08:10 2016
@@ -217,7 +217,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNU
#endif
/*
- * Grab well-defined DH parameters from OpenSSL, see the get_rfc*
+ * Grab well-defined DH parameters from OpenSSL, see the BN_get_rfc*
* functions in for all available primes.
*/
static DH *make_dh_params(BIGNUM *(*prime)(BIGNUM *))
@@ -248,12 +248,12 @@ static struct dhparam {
DH *dh; /* ...this, used for keys */
const unsigned int min; /* ...of length >= this. */
} dhparams[] = {
-{ get_rfc3526_prime_8192, NULL, 6145 },
-{ get_rfc3526_prime_6144, NULL, 4097 },
-{ get_rfc3526_prime_4096, NULL, 3073 },
-{ get_rfc3526_prime_3072, NULL, 2049 },
-{ get_rfc3526_prime_2048, NULL, 1025 },
-{ get_rfc2409_prime_1024, NULL, 0 }
+{ BN_get_rfc3526_prime_8192, NULL, 6145 },
+{ BN_get_rfc3526_prime_6144, NULL, 4097 },
+{ BN_get_rfc3526_prime_4096, NULL, 3073 },
+{ BN_get_rfc3526_prime_3072, NULL, 2049 },
+{ BN_get_rfc3526_prime_2048, NULL, 1025 },
+{ BN_get_rfc2409_prime_1024, NULL, 0 }
};
static void init_dh_params(void)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Adding tomcat to HTTP/2 implementation list
Hi, I have updated the wiki page: https://github.com/http2/http2-spec/wiki/Implementations. -- From:Mark Thomas Time:2016 Apr 19 (Tue) 17:49 To:Tomcat Developers List Subject:Re: Adding tomcat to HTTP/2 implementation list On 19/04/2016 03:53, Huxing Zhang wrote: > Hi, > > I am planing to add tomcat to the list of known HTTP/2 implementation: > https://github.com/http2/http2-spec/wiki/Implementations > > Before committing, I would like to confirm with you guys: > > Name: Apache Tomcat 8.5+(http://tomcat.apache.org/) > Language: Java > role(s): Server > negotiation(s): ALPN, Upgrade > protocol id(s): h2, h2c > > The main concern is whether direct negotiation is supported or not. > IMO the direct negotiation is not supported. > > Is that information correct? Yes, that is correct. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for tc-native 1.2.6
Am 19.04.2016 um 11:35 schrieb Rainer Jung: I just now saw, that there's again an API break for OpenSSL 1.1.0. I'll try to fix that during the next hour. I don't understand the Gump failure for tcnative trunk which happened this night. The errors look like tcnative trunk has been compiled against a mixture of header files from OpenSSL master and older, but the OpenSSL build logs on Gump don't indicate any such error. For example the first build error was: /bin/bash /srv/gump/public/workspace/apr-1/dest-20160419/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP -I/srv/gump/public/workspace/tomcat-native-trunk/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20160419/include -I/srv/gump/public/workspace/apr-1/dest-20160419/include/apr-1 -o src/ssl.lo -c src/ssl.c && touch src/ssl.lo In file included from src/ssl.c:17:0: src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_versionString': src/ssl.c:312:43: error: 'OPENSSL_VERSION' undeclared (first use in this function) return AJP_TO_JSTRING(OpenSSL_version(OPENSSL_VERSION)); But the OpenSSL master snapshots for 20160418 and 20140619 contain the line # define OPENSSL_VERSION 0 in openssl/crypto.h and there have been no more recent changes to the OpenSSL master on github from which Gump gets its files. I found another API change which I fixed in r1739889, but that was not related. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Any chance to look at installed build results on Gump?
Is there a way to look at installed build results on Gump? I would be interested in /srv/gump/public/workspace/openssl-master/dest-20160419/include/openssl/err.h and probably other files in this installation. A build error indicates something is on line 349, which on all version of the file I know is on line 355 or even further down the file. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Any chance to look at installed build results on Gump?
2016-04-19 13:34 GMT+03:00 Rainer Jung : > Is there a way to look at installed build results on Gump? I would be > interested in > > /srv/gump/public/workspace/openssl-master/dest-20160419/include/openssl/err.h > > and probably other files in this installation. A build error indicates > something is on line 349, which on all version of the file I know is on line > 355 or even further down the file. As far as I understand, Git support at Gump is currently broken. The visible effect is that it operates on stale sources. Openssl is one of affected projects. Checkstyle is another. See thread on general@gump. About the file: I think it is possible to mark some files as reports in project configuration, so that they will be visible + downloadable, like JUnit test results. Also some people have access to the VM running Gump. Mark helped to configure it several times. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Any chance to look at installed build results on Gump?
Am 19.04.2016 um 13:41 schrieb Konstantin Kolinko: 2016-04-19 13:34 GMT+03:00 Rainer Jung : Is there a way to look at installed build results on Gump? I would be interested in /srv/gump/public/workspace/openssl-master/dest-20160419/include/openssl/err.h and probably other files in this installation. A build error indicates something is on line 349, which on all version of the file I know is on line 355 or even further down the file. As far as I understand, Git support at Gump is currently broken. The visible effect is that it operates on stale sources. Openssl is one of affected projects. Checkstyle is another. See thread on general@gump. Thanks for the info, I have looked at the thread now. About the file: I think it is possible to mark some files as reports in project configuration, so that they will be visible + downloadable, like JUnit test results. OK, good to know. I have access to the config and will use that trick for now. Also some people have access to the VM running Gump. Mark helped to configure it several times. OK, thanks, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for tc-native 1.2.6
Am 19.04.2016 um 12:17 schrieb Rainer Jung: Am 19.04.2016 um 11:35 schrieb Rainer Jung: I just now saw, that there's again an API break for OpenSSL 1.1.0. I'll try to fix that during the next hour. I don't understand the Gump failure for tcnative trunk which happened this night. The errors look like tcnative trunk has been compiled against a mixture of header files from OpenSSL master and older, but the OpenSSL build logs on Gump don't indicate any such error. For example the first build error was: /bin/bash /srv/gump/public/workspace/apr-1/dest-20160419/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP -I/srv/gump/public/workspace/tomcat-native-trunk/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20160419/include -I/srv/gump/public/workspace/apr-1/dest-20160419/include/apr-1 -o src/ssl.lo -c src/ssl.c && touch src/ssl.lo In file included from src/ssl.c:17:0: src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_versionString': src/ssl.c:312:43: error: 'OPENSSL_VERSION' undeclared (first use in this function) return AJP_TO_JSTRING(OpenSSL_version(OPENSSL_VERSION)); But the OpenSSL master snapshots for 20160418 and 20140619 contain the line # define OPENSSL_VERSION 0 in openssl/crypto.h and there have been no more recent changes to the OpenSSL master on github from which Gump gets its files. Konstantin has pointed out on otherthread, that Gump has some issues with stale git pulled resources currently. The build failures during last night look to me, as they wouldn't happen with a recent OpenSSL master checkout (and they don't happen for me locally). So IMHO we are good to go. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Any chance to look at installed build results on Gump?
On 19/04/2016 13:53, Rainer Jung wrote: > Am 19.04.2016 um 13:41 schrieb Konstantin Kolinko: >> 2016-04-19 13:34 GMT+03:00 Rainer Jung : >>> Is there a way to look at installed build results on Gump? I would be >>> interested in >>> >>> /srv/gump/public/workspace/openssl-master/dest-20160419/include/openssl/err.h >>> >>> >>> and probably other files in this installation. A build error indicates >>> something is on line 349, which on all version of the file I know is >>> on line >>> 355 or even further down the file. >> >> >> As far as I understand, Git support at Gump is currently broken. >> The visible effect is that it operates on stale sources. >> >> Openssl is one of affected projects. Checkstyle is another. >> >> See thread on general@gump. > > Thanks for the info, I have looked at the thread now. > >> About the file: >> I think it is possible to mark some files as reports in project >> configuration, so that they will be visible + downloadable, like JUnit >> test results. > > OK, good to know. I have access to the config and will use that trick > for now. I have shell access to that box. I've grabbed a copy of the file and put it here: http://home.apache.org/~markt/dev/gump-debug/ >> Also some people have access to the VM running Gump. Mark helped to >> configure it several times. > > OK, thanks, What else, if anything, would you like me to do? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Any chance to look at installed build results on Gump?
On 19/04/2016 14:51, Mark Thomas wrote: > On 19/04/2016 13:53, Rainer Jung wrote: >> Am 19.04.2016 um 13:41 schrieb Konstantin Kolinko: >>> 2016-04-19 13:34 GMT+03:00 Rainer Jung : >>>> Is there a way to look at installed build results on Gump? I would be >>>> interested in >>>> >>>> /srv/gump/public/workspace/openssl-master/dest-20160419/include/openssl/err.h >>>> >>>> >>>> and probably other files in this installation. A build error indicates >>>> something is on line 349, which on all version of the file I know is >>>> on line >>>> 355 or even further down the file. >>> >>> >>> As far as I understand, Git support at Gump is currently broken. >>> The visible effect is that it operates on stale sources. >>> >>> Openssl is one of affected projects. Checkstyle is another. >>> >>> See thread on general@gump. >> >> Thanks for the info, I have looked at the thread now. >> >>> About the file: >>> I think it is possible to mark some files as reports in project >>> configuration, so that they will be visible + downloadable, like JUnit >>> test results. >> >> OK, good to know. I have access to the config and will use that trick >> for now. > > I have shell access to that box. I've grabbed a copy of the file and put > it here: > > http://home.apache.org/~markt/dev/gump-debug/ > >>> Also some people have access to the VM running Gump. Mark helped to >>> configure it several times. >> >> OK, thanks, > > What else, if anything, would you like me to do? I've done a little digging and somehow there a whole bunch of local commits have been made that don't appear in the main git repo. I'm going to stick them all in a branch and then reset openssl-master to the current HEAD. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Any chance to look at installed build results on Gump?
Am 19.04.2016 um 15:51 schrieb Mark Thomas: On 19/04/2016 13:53, Rainer Jung wrote: Am 19.04.2016 um 13:41 schrieb Konstantin Kolinko: 2016-04-19 13:34 GMT+03:00 Rainer Jung : Is there a way to look at installed build results on Gump? I would be interested in /srv/gump/public/workspace/openssl-master/dest-20160419/include/openssl/err.h and probably other files in this installation. A build error indicates something is on line 349, which on all version of the file I know is on line 355 or even further down the file. As far as I understand, Git support at Gump is currently broken. The visible effect is that it operates on stale sources. Openssl is one of affected projects. Checkstyle is another. See thread on general@gump. Thanks for the info, I have looked at the thread now. About the file: I think it is possible to mark some files as reports in project configuration, so that they will be visible + downloadable, like JUnit test results. OK, good to know. I have access to the config and will use that trick for now. I have shell access to that box. I've grabbed a copy of the file and put it here: http://home.apache.org/~markt/dev/gump-debug/ I checked the err.h file. It is the same as OpenSSL master git dee502be89e78e2979e3bd1d7724cf79daa6ef61 and dates back to 2015-03-31. It is actually the oldest existing revision of the file in this directory. So we build against an OpenSSL version that declares itself to be 1.1.0 but has an API that isn't compatible with recent 1.1.0. No wonder builds fail. Also some people have access to the VM running Gump. Mark helped to configure it several times. OK, thanks, What else, if anything, would you like me to do? Stefan Bodewig added a git hard reset step after pulling from git which seems to result in stale files (changes r1739544 and r1739600 to git.py). Konstantin and him are discussing on general@gump how to fix this. So I think nothing you can help on the system right now. Regards and thanks, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1739975 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/http2/ webapps/do
Author: markt
Date: Tue Apr 19 18:43:41 2016
New Revision: 1739975
URL: http://svn.apache.org/viewvc?rev=1739975&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59220
Ensure that AsyncListener.onComplete() is called if the async request times out
and the response is already committed.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/coyote/ActionCode.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1739975&r1=1739974&r2=1739975&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Tue Apr
19 18:43:41 2016
@@ -253,6 +253,12 @@ public class CoyoteAdapter implements Ad
AtomicBoolean error = new AtomicBoolean(false);
res.action(ActionCode.IS_ERROR, error);
if (error.get()) {
+if (request.isAsyncCompleting()) {
+// Connection will be forcibly closed which will prevent
+// completion happening at the usual point. Need to trigger
+// call to onComplete() here.
+res.action(ActionCode.ASYNC_POST_PROCESS, null);
+}
success = false;
}
} catch (IOException e) {
Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=1739975&r1=1739974&r2=1739975&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Tue Apr 19 18:43:41 2016
@@ -189,6 +189,12 @@ public enum ActionCode {
ASYNC_IS_ERROR,
/**
+ * Callback to trigger post processing. Typically only used during error
+ * handling to trigger essential processing that otherwise would be
skipped.
+ */
+ASYNC_POST_PROCESS,
+
+/**
* Callback to trigger the HTTP upgrade process.
*/
UPGRADE,
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1739975&r1=1739974&r2=1739975&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Apr 19
18:43:41 2016
@@ -596,6 +596,10 @@ public class AjpProcessor extends Abstra
result.set(asyncStateMachine.asyncTimeout());
break;
}
+case ASYNC_POST_PROCESS: {
+asyncStateMachine.asyncPostProcess();
+break;
+}
// Servlet 3.1 non-blocking I/O
case REQUEST_BODY_FULLY_READ: {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1739975&r1=1739974&r2=1739975&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Apr 19
18:43:41 2016
@@ -901,6 +901,10 @@ public class Http11Processor extends Abs
result.set(asyncStateMachine.asyncTimeout());
break;
}
+case ASYNC_POST_PROCESS: {
+asyncStateMachine.asyncPostProcess();
+break;
+}
// Servlet 3.1 non-blocking I/O
case REQUEST_BODY_FULLY_READ: {
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1739975&r1=1739974&r2=1739975&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue Apr 19
18:43:41 2016
@@ -316,6 +316,10 @@ public class StreamProcessor extends Abs
result.set(asyncStateMachine.asyncTimeout());
break;
}
+case ASYNC_POST_PROCESS: {
+asyncStateMachine.asyncPostProcess();
+break;
+}
// Servlet 3.1 non-blocking I/O
svn commit: r1739978 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/http2/
Author: markt
Date: Tue Apr 19 18:44:38 2016
New Revision: 1739978
URL: http://svn.apache.org/viewvc?rev=1739978&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59220
Ensure that AsyncListener.onComplete() is called if the async request times out
and the response is already committed.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 19 18:44:38 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1739978&r1=1739977&r2=1739978&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Tue Apr 19 18:44:38 2016
@@ -253,6 +253,12 @@ public class CoyoteAdapter implements Ad
AtomicBoolean error = new AtomicBoolean(false);
res.action(ActionCode.IS_ERROR, error);
if (error.get()) {
+if (request.isAsyncCompleting()) {
+// Connection will be forcibly closed which will prevent
+// completion happening at the usual point. Need to trigger
+// call to onComplete() here.
+res.action(ActionCode.ASYNC_POST_PROCESS, null);
+}
success = false;
}
} catch (IOException e) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java?rev=1739978&r1=1739977&r2=1739978&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java Tue Apr 19
18:44:38 2016
@@ -189,6 +189,12 @@ public enum ActionCode {
ASYNC_IS_ERROR,
/**
+ * Callback to trigger post processing. Typically only used during error
+ * handling to trigger essential processing that otherwise would be
skipped.
+ */
+ASYNC_POST_PROCESS,
+
+/**
* Callback to trigger the HTTP upgrade process.
*/
UPGRADE,
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1739978&r1=1739977&r2=1739978&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Apr
19 18:44:38 2016
@@ -596,6 +596,10 @@ public class AjpProcessor extends Abstra
result.set(asyncStateMachine.asyncTimeout());
break;
}
+case ASYNC_PO
svn commit: r1739981 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ webapps/docs/
Author: markt Date: Tue Apr 19 18:49:05 2016 New Revision: 1739981 URL: http://svn.apache.org/viewvc?rev=1739981&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59220 Ensure that AsyncListener.onComplete() is called if the async request times out and the response is already committed. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/ActionCode.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 19 18:49:05 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,16857
[Bug 59220] AsyncListener#onComplete not called after timeout if buffer is flushed
https://bz.apache.org/bugzilla/show_bug.cgi?id=59220 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #13 from Mark Thomas --- Fixed in: - 9.0.x for 9.0.0.M5 onwards - 8.5.x for 8.5.1 onwards - 8.0.x for 8.0.34 onwards - 7.0.x for 7.0.70 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1739983 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ webapps/docs/
Author: markt Date: Tue Apr 19 18:53:44 2016 New Revision: 1739983 URL: http://svn.apache.org/viewvc?rev=1739983&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59220 Ensure that AsyncListener.onComplete() is called if the async request times out and the response is already committed. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ActionCode.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 19 18:53:44 2016 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1 726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821 +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,
Re: Looking for mentor
Yes, why not, since the past two days i were configuring my VM to run Ubuntu on my Windows 7, until today i finished (maybe because i'm not expert), the problem were when launch catalina jpda start, i can't listen on port 8000 (i tried to add rule in firewall but didn't work), so i changed it to default JPDA port 1044, and now it works fine :) Thank you for your caring, so nice from you :) 2016-04-19 8:56 GMT+01:00 Mark Thomas : > On 17/04/2016 19:27, Abdessamed MANSOURI wrote: > > Thank you so much, its so nice from you :) > > Another idea for somewhere to get started... > > I recently fixed bug 59219. That included a stand-alone test case but I > didn't port that test case into the Tomcat unit tests. Porting that test > case could be a great place to start getting involved. > > Mark > > > > > > 2016-04-17 15:36 GMT+01:00 Mark Thomas : > > > >> On 17/04/2016 11:34, Abdessamed MANSOURI wrote: > >>> Guys, inside Tomcat source, there's many packages (Catalina, Jasper, > >>> Tomcat, Juli, Coyote) what these packages stand for?? ( i want to > >>> understand basic Tomcat architecture) :) > >> > >> It is for Tomcat 6 and while the detail has changed the high-level > >> structure hasn't. > >> > >> > https://www.packtpub.com/networking-and-servers/tomcat-6-developers-guide > >> > >> Catalina - The Servlet engine > >> Coyote - The HTTP, HTTP/2 and AJP I/O code > >> EL - The UEL implementation > >> Jasper - The JSP engine > >> JULI - Internal logging framework > >> Tomcat - Various utility packages, low-level I/O code and the > >> WebSocket implementation > >> Naming - JNDI code > >> > >> Mark > >> > >> > >>> > >>> Thank you all. > >>> > >>> 2016-04-16 22:46 GMT+01:00 Abdessamed MANSOURI : > >>> > Martin, i just have 2 computers (laptop and desktop), i don't use > >> desktop > too much, so in past i tried many JVM implementations, i wanted to see > performance for each one, but today, when i launched unit tests, i > >> forget > about changing it to OpenJDK, so at the end i figured that i used J9 > :) > > Mark, okey, i will try my best :) > > Thank you all for your time. > > 2016-04-16 20:44 GMT+01:00 Mark Thomas : > > > On 16/04/2016 20:34, Abdessamed MANSOURI wrote: > >> Thank you for your response and your time, i checkouted svn trunk > and > > built > >> Tomcat successfully, its works fine, i also run ant test, for unit > > testing, > >> but it ended with some errors (i've used IBM J9), now i completed > this > >> step, what do you suggests me to do now?? :) > > > > You could investigate those unit test failures to see why they > >> happened. > > > > You could look at one of the open bugs or enhancement requests and > try > > producing a patch. Some possible starting point are: > > - https://bz.apache.org/bugzilla/show_bug.cgi?id=57892 > > - https://bz.apache.org/bugzilla/show_bug.cgi?id=44787 > > - https://bz.apache.org/bugzilla/show_bug.cgi?id=47214 > > - https://bz.apache.org/bugzilla/show_bug.cgi?id=52952 > > > >> I can't find Tomcat on Jira, why?? :) > > > > Because the Tomcat project uses Bugzilla, not Jira. > > > > Mark > > > > > >> > >> Thank you for your time again. > >> > >> 2016-04-16 16:25 GMT+01:00 Mark Thomas : > >> > >>> On 15/04/2016 17:59, Abdessamed MANSOURI wrote: > Hello all, > > I'm newcomer and i want to contribute to Tomcat developement, i > have > > some > free time (alots of time), so i want to be useful in this world > >> better > >>> than > sleeping all the day, so i'm looking for applying Apache mentoring > >>> program, > i'm not guru in Java but not totaly a newbie, so i want to try all > >> my > >>> best > to help you guys, who want to be my mentor?? > >>> > >>> Welcome to the Tomcat development community. Feel free to ask any > >>> questions you have on this list. > >>> > Note : i still student, but i'm not looking to do Tomcat as my > final > project (i already have a final project), i wan't to help you (as > >> much > >>> as i > can). > > Thank you all for your time. > >>> > >>> The first step is to make sure you can build Tomcat locally. Follow > >> the > >>> instructions in [1] to checkout the latest Tomcat source and and > >> build > > it. > >>> > >>> Note that the URL you'll need to checkout Tomcat trunk is: > >>> https://svn.apache.org/viewvc/tomcat/trunk > >>> > >>> If you have any questions, just ask. > >>> > >>> Mark > >>> > >>> > >>> [1] > > https://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?view=markup > >>> > >>> > >>> > - > >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.ap
svn commit: r1739993 - /tomcat/native/trunk/java/org/apache/tomcat/
Author: markt Date: Tue Apr 19 20:06:18 2016 New Revision: 1739993 URL: http://svn.apache.org/viewvc?rev=1739993&view=rev Log: Update external Modified: tomcat/native/trunk/java/org/apache/tomcat/ (props changed) Propchange: tomcat/native/trunk/java/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Tue Apr 19 20:06:18 2016 @@ -1 +1 @@ -^/tomcat/trunk/java/org/apache/tomcat/jni@1731008 jni +^/tomcat/trunk/java/org/apache/tomcat/jni@1737155 jni - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740001 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_6: ./ build.properties.default native/include/tcn_version.h
Author: markt
Date: Tue Apr 19 20:48:23 2016
New Revision: 1740001
URL: http://svn.apache.org/viewvc?rev=1740001&view=rev
Log:
Tag 1.2.6
Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_6/
- copied from r174, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_6/build.properties.default
tomcat/native/tags/TOMCAT_NATIVE_1_2_6/native/include/tcn_version.h
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_6/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_6/build.properties.default?rev=1740001&r1=174&r2=1740001&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_6/build.properties.default (original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_6/build.properties.default Tue Apr 19
20:48:23 2016
@@ -20,7 +20,7 @@ version.major=1
version.minor=2
version.build=6
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_6/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_6/native/include/tcn_version.h?rev=1740001&r1=174&r2=1740001&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_6/native/include/tcn_version.h
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_6/native/include/tcn_version.h Tue Apr
19 20:48:23 2016
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1740016 - /tomcat/native/trunk/native/srclib/VERSIONS
Author: markt Date: Tue Apr 19 21:28:39 2016 New Revision: 1740016 URL: http://svn.apache.org/viewvc?rev=1740016&view=rev Log: Update deps. Windows build works with 1.5.2 now. Modified: tomcat/native/trunk/native/srclib/VERSIONS Modified: tomcat/native/trunk/native/srclib/VERSIONS URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/VERSIONS?rev=1740016&r1=1740015&r2=1740016&view=diff == --- tomcat/native/trunk/native/srclib/VERSIONS (original) +++ tomcat/native/trunk/native/srclib/VERSIONS Tue Apr 19 21:28:39 2016 @@ -1,4 +1,4 @@ Use the following version of the libraries -- APR 1.5.1, http://apr.apache.org +- APR 1.5.2, http://apr.apache.org - OpenSSL 1.0.2g or later, http://www.openssl.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r13302 - in /dev/tomcat/tomcat-connectors/native/1.2.6: ./ binaries/ source/
Author: markt Date: Tue Apr 19 21:30:40 2016 New Revision: 13302 Log: Upload tomcat-native 1.2.6 for voting Added: dev/tomcat/tomcat-connectors/native/1.2.6/ dev/tomcat/tomcat-connectors/native/1.2.6/binaries/ dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.sha1 dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-win32-bin.zip.sha1 dev/tomcat/tomcat-connectors/native/1.2.6/source/ dev/tomcat/tomcat-connectors/native/1.2.6/source/tomcat-native-1.2.6-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.6/source/tomcat-native-1.2.6-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.6/source/tomcat-native-1.2.6-src.tar.gz.md5 dev/tomcat/tomcat-connectors/native/1.2.6/source/tomcat-native-1.2.6-src.tar.gz.sha1 dev/tomcat/tomcat-connectors/native/1.2.6/source/tomcat-native-1.2.6-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.6/source/tomcat-native-1.2.6-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.6/source/tomcat-native-1.2.6-win32-src.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.6/source/tomcat-native-1.2.6-win32-src.zip.sha1 Added: dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.asc Tue Apr 19 21:30:40 2016 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJXFqKBAAoJEBDAHFovYFnn+wIP/jnTiAsLM9cX6nB31FbSI4rv +JbMNLTnkc4cSqQ9wZKmYoXsD+Whs0f8FePFt1M8kuxKCw38xNRuntGQ0np4C2YeD +5/DWNKrxJ9wp3wzqhbIcSW7eUTwLAM18f6bc/UllP297bZtLDfYtjKolFDfbOlmy +byewycTKcfeo32SfvCdr7jOTFy1+wcfoEAQcFh6uniltLRXM2N5iLtizsjmxGYrQ +0yddclSVu2/HRyrJ/WJ76+rlfeEhZ6KP3XCDg3fQUxyOpXiv47YhFqlV81c2Y0AC +WOi43r4+sf+AvbVP+FHJQQSJVhhdIIaY7C0Ft/ameISqRAShbjDiu5ewzURxwvXi +i9i4hfExPbxrt2+Hi/mJ27uhBmxsqfa+Z7IIj6wfAiibivLzUD0yGsqX4x9/IGLV +rNjDfNEnFZkuZJLIFencIwQVFADV7SQ9fjqwI+xn8Ywc3Q0zt5uyd36dc1Cq8rJN +B0R8KkND+5VDLjodanmziR4+HtYn9xjeBHTLhPJ6syjxXZ5n3ihwy/+r2Eow68Yq +8Kr7pAWqKYBou08W0uHfpwSbfQJnQzq4AFabrMzBrAAFiePtE9oF3u2ELMhug0bu +2hCHE9eQ0ZQ0Pwr0UdQgOq1JJH5SYX6gzeXmJ6bteBA7r63PPtkA8EkHtK+aXR4V +tuTCROHQMFuXlxwjP2Vp +=QyMr +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.md5 == --- dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.md5 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.md5 Tue Apr 19 21:30:40 2016 @@ -0,0 +1 @@ +c2fe496646e2e72e96298ca7044d2e38 *tomcat-native-1.2.6-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.sha1 == --- dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.sha1 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-ocsp-win32-bin.zip.sha1 Tue Apr 19 21:30:40 2016 @@ -0,0 +1 @@ +9a9c31ee2d7e5e8f49ee56fee47f4eb2661ee411 *tomcat-native-1.2.6-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.6/binaries/tomcat-native-1.2.6-win32-bin.zip -- svn:mime
[VOTE] Release Apache Tomcat Native 1.2.6
Version 1.2.6 includes the following changes: - Add support for using Java keystores for certificate chains - Fixes to allow continued building with master The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.6 is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.6/ [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_6 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Looking for mentor
correct me, if i'm wrong, plz :) 2016-04-19 22:58 GMT+01:00 Abdessamed MANSOURI : > I'm seeing how you write unit test by reading the written unit test, i > think, i should inherit TomcatBaseTest then use getTomcatInstance to get a > Tomcat instance, then add the servlet to the context, then launching > getUrl, and then how do i can know test the bug, do i should test it > returned response from the servlet against expected one, or another thing?? > :) >
Re: Looking for mentor
I'm seeing how you write unit test by reading the written unit test, i think, i should inherit TomcatBaseTest then use getTomcatInstance to get a Tomcat instance, then add the servlet to the context, then launching getUrl, and then how do i can know test the bug, do i should test it returned response from the servlet against expected one, or another thing?? :)
Re: Looking for mentor
I think, i just have to write a simple test case which is pretty similair to TestAsyncContextImpl.testListeners, or not?? :)
svn commit: r1740044 - in /tomcat/trunk/java/org/apache/catalina/tribes: group/ group/interceptors/ membership/ transport/ transport/bio/ transport/nio/
Author: kfujino
Date: Wed Apr 20 04:58:59 2016
New Revision: 1740044
URL: http://svn.apache.org/viewvc?rev=1740044&view=rev
Log:
Change the channel field to protected.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1740044&r1=1740043&r2=1740044&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Wed Apr 20 04:58:59 2016
@@ -151,10 +151,10 @@ public class ChannelCoordinator extends
//listens to with the local membership settings
if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
clusterReceiver.setMessageListener(this);
-clusterReceiver.setChannel(getChannel());
+clusterReceiver.setChannel(channel);
clusterReceiver.start();
//synchronize, big time FIXME
-Member localMember = getChannel().getLocalMember(false);
+Member localMember = channel.getLocalMember(false);
if (localMember instanceof StaticMember) {
// static member
StaticMember staticMember = (StaticMember)localMember;
@@ -171,14 +171,14 @@ public class ChannelCoordinator extends
valid = true;
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
-clusterSender.setChannel(getChannel());
+clusterSender.setChannel(channel);
clusterSender.start();
valid = true;
}
if ( Channel.MBR_RX_SEQ==(svc & Channel.MBR_RX_SEQ) ) {
membershipService.setMembershipListener(this);
-membershipService.setChannel(getChannel());
+membershipService.setChannel(channel);
if (membershipService instanceof McastService) {
((McastService)membershipService).setMessageListener(this);
}
@@ -186,7 +186,7 @@ public class ChannelCoordinator extends
valid = true;
}
if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
-membershipService.setChannel(getChannel());
+membershipService.setChannel(channel);
membershipService.start(MembershipService.MBR_TX);
valid = true;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1740044&r1=1740043&r2=1740044&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Wed Apr 20 04:58:59 2016
@@ -29,7 +29,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
-private Channel channel;
+protected Channel channel;
//default value, always process
protected int optionFlag = 0;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1740044&r1=1740043&r2=1740044&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Wed Apr 20 04:58:59 2016
@@ -111,7 +111,7 @@ public class MessageDispatchInterceptor
return;
svn commit: r1740045 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes: group/ group/interceptors/ membership/ transport/ transport/bio/ transport/nio/
Author: kfujino
Date: Wed Apr 20 05:00:50 2016
New Revision: 1740045
URL: http://svn.apache.org/viewvc?rev=1740045&view=rev
Log:
Change the channel field to protected.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1740045&r1=1740044&r2=1740045&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Wed Apr 20 05:00:50 2016
@@ -151,10 +151,10 @@ public class ChannelCoordinator extends
//listens to with the local membership settings
if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
clusterReceiver.setMessageListener(this);
-clusterReceiver.setChannel(getChannel());
+clusterReceiver.setChannel(channel);
clusterReceiver.start();
//synchronize, big time FIXME
-Member localMember = getChannel().getLocalMember(false);
+Member localMember = channel.getLocalMember(false);
if (localMember instanceof StaticMember) {
// static member
StaticMember staticMember = (StaticMember)localMember;
@@ -171,14 +171,14 @@ public class ChannelCoordinator extends
valid = true;
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
-clusterSender.setChannel(getChannel());
+clusterSender.setChannel(channel);
clusterSender.start();
valid = true;
}
if ( Channel.MBR_RX_SEQ==(svc & Channel.MBR_RX_SEQ) ) {
membershipService.setMembershipListener(this);
-membershipService.setChannel(getChannel());
+membershipService.setChannel(channel);
if (membershipService instanceof McastService) {
((McastService)membershipService).setMessageListener(this);
}
@@ -186,7 +186,7 @@ public class ChannelCoordinator extends
valid = true;
}
if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
-membershipService.setChannel(getChannel());
+membershipService.setChannel(channel);
membershipService.start(MembershipService.MBR_TX);
valid = true;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1740045&r1=1740044&r2=1740045&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Wed Apr 20 05:00:50 2016
@@ -29,7 +29,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
-private Channel channel;
+protected Channel channel;
//default value, always process
protected int optionFlag = 0;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1740045&r1=1740044&r2=1740045&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/tc8.5.x/trunk/java/or
svn commit: r1740046 - in /tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes: group/ group/interceptors/ membership/ transport/ transport/bio/ transport/nio/
Author: kfujino
Date: Wed Apr 20 05:02:56 2016
New Revision: 1740046
URL: http://svn.apache.org/viewvc?rev=1740046&view=rev
Log:
Change the channel field to protected.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1740046&r1=1740045&r2=1740046&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Wed Apr 20 05:02:56 2016
@@ -154,11 +154,11 @@ public class ChannelCoordinator extends
if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
clusterReceiver.setMessageListener(this);
if (clusterReceiver instanceof ReceiverBase) {
-((ReceiverBase)clusterReceiver).setChannel(getChannel());
+((ReceiverBase)clusterReceiver).setChannel(channel);
}
clusterReceiver.start();
//synchronize, big time FIXME
-Member localMember = getChannel().getLocalMember(false);
+Member localMember = channel.getLocalMember(false);
if (localMember instanceof StaticMember) {
// static member
StaticMember staticMember = (StaticMember)localMember;
@@ -176,7 +176,7 @@ public class ChannelCoordinator extends
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
if (clusterSender instanceof ReplicationTransmitter) {
-
((ReplicationTransmitter)clusterSender).setChannel(getChannel());
+
((ReplicationTransmitter)clusterSender).setChannel(channel);
}
clusterSender.start();
valid = true;
@@ -186,14 +186,14 @@ public class ChannelCoordinator extends
membershipService.setMembershipListener(this);
if (membershipService instanceof McastService) {
((McastService)membershipService).setMessageListener(this);
-((McastService)membershipService).setChannel(getChannel());
+((McastService)membershipService).setChannel(channel);
}
membershipService.start(MembershipService.MBR_RX);
valid = true;
}
if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
if (membershipService instanceof McastService) {
-((McastService)membershipService).setChannel(getChannel());
+((McastService)membershipService).setChannel(channel);
}
membershipService.start(MembershipService.MBR_TX);
valid = true;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1740046&r1=1740045&r2=1740046&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Wed Apr 20 05:02:56 2016
@@ -29,7 +29,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
-private Channel channel;
+protected Channel channel;
//default value, always process
protected int optionFlag = 0;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interc
svn commit: r1740047 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes: group/ group/interceptors/ membership/ transport/ transport/bio/ transport/nio/
Author: kfujino
Date: Wed Apr 20 05:04:19 2016
New Revision: 1740047
URL: http://svn.apache.org/viewvc?rev=1740047&view=rev
Log:
Change the channel field to protected.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1740047&r1=1740046&r2=1740047&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Wed Apr 20 05:04:19 2016
@@ -144,11 +144,11 @@ public class ChannelCoordinator extends
if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
clusterReceiver.setMessageListener(this);
if (clusterReceiver instanceof ReceiverBase) {
-((ReceiverBase)clusterReceiver).setChannel(getChannel());
+((ReceiverBase)clusterReceiver).setChannel(channel);
}
clusterReceiver.start();
//synchronize, big time FIXME
-Member localMember = getChannel().getLocalMember(false);
+Member localMember = channel.getLocalMember(false);
if (localMember instanceof StaticMember) {
// static member
StaticMember staticMember = (StaticMember)localMember;
@@ -167,7 +167,7 @@ public class ChannelCoordinator extends
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
if (clusterSender instanceof ReplicationTransmitter) {
-
((ReplicationTransmitter)clusterSender).setChannel(getChannel());
+
((ReplicationTransmitter)clusterSender).setChannel(channel);
}
valid = true;
clusterSender.start();
@@ -177,14 +177,14 @@ public class ChannelCoordinator extends
membershipService.setMembershipListener(this);
if (membershipService instanceof McastService) {
((McastService)membershipService).setMessageListener(this);
-((McastService)membershipService).setChannel(getChannel());
+((McastService)membershipService).setChannel(channel);
}
membershipService.start(MembershipService.MBR_RX);
valid = true;
}
if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
if (membershipService instanceof McastService) {
-((McastService)membershipService).setChannel(getChannel());
+((McastService)membershipService).setChannel(channel);
}
membershipService.start(MembershipService.MBR_TX);
valid = true;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1740047&r1=1740046&r2=1740047&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Wed Apr 20 05:04:19 2016
@@ -30,7 +30,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
-private Channel channel;
+protected Channel channel;
//default value, always process
protected int optionFlag = 0;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Inte
