svn commit: r391288 - /tomcat/connectors/trunk/jni/native/src/sslnetwork.c
Author: mturk
Date: Tue Apr 4 05:32:16 2006
New Revision: 391288
URL: http://svn.apache.org/viewcvs?rev=391288&view=rev
Log:
Fix ssl code by properly registering the socket
shutdown modes.
Modified:
tomcat/connectors/trunk/jni/native/src/sslnetwork.c
Modified: tomcat/connectors/trunk/jni/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/src/sslnetwork.c?rev=391288&r1=391287&r2=391288&view=diff
==
--- tomcat/connectors/trunk/jni/native/src/sslnetwork.c (original)
+++ tomcat/connectors/trunk/jni/native/src/sslnetwork.c Tue Apr 4 05:32:16 2006
@@ -289,19 +289,22 @@
int i = SSL_get_error(con->ssl, s);
switch (i) {
case SSL_ERROR_NONE:
+con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
return APR_SUCCESS;
break;
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
if ((rv = wait_for_io_or_timeout(con, i)) != APR_SUCCESS) {
+con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return rv;
}
break;
case SSL_ERROR_SYSCALL:
+case SSL_ERROR_SSL:
s = apr_get_netos_error();
if (!APR_STATUS_IS_EAGAIN(s) &&
!APR_STATUS_IS_EINTR(s)) {
-con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
+con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return s;
}
break;
@@ -309,7 +312,7 @@
/*
* Anything else is a fatal error
*/
-con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
+con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return SSL_TO_APR_ERROR(i);
break;
}
@@ -319,7 +322,7 @@
*/
if (SSL_get_verify_result(con->ssl) != X509_V_OK) {
/* TODO: Log SSL client authentication failed */
-con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
+con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
/* TODO: Figure out the correct return value */
return APR_EGENERAL;
}
@@ -355,28 +358,33 @@
switch (i) {
case SSL_ERROR_ZERO_RETURN:
*len = 0;
+con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
return APR_EOF;
break;
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
if ((rv = wait_for_io_or_timeout(con, i)) != APR_SUCCESS) {
+con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return rv;
}
break;
case SSL_ERROR_SYSCALL:
+case SSL_ERROR_SSL:
if (!APR_STATUS_IS_EAGAIN(os) &&
!APR_STATUS_IS_EINTR(os)) {
-con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
+con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return os;
}
break;
default:
+con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return os;
break;
}
}
else {
*len = s;
+con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
break;
}
}
@@ -388,16 +396,17 @@
apr_size_t *len)
{
tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
-int s, rd = (int)(*len);
+int s, wr = (int)(*len);
apr_status_t rv = APR_SUCCESS;
for (;;) {
-if ((s = SSL_write(con->ssl, buf, rd)) <= 0) {
+if ((s = SSL_write(con->ssl, buf, wr)) <= 0) {
apr_status_t os = apr_get_netos_error();
int i = SSL_get_error(con->ssl, s);
switch (i) {
case SSL_ERROR_ZERO_RETURN:
*len = 0;
+con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
return APR_EOF;
break;
case SSL_ERROR_WANT_READ:
@@ -407,13 +416,15 @@
}
break;
case SSL_ERROR_SYSCALL:
+case SSL_ERROR_SSL:
if (!APR_STATUS_IS_EAGAIN(os) &&
!APR_STATUS_IS_EINTR(os)) {
-con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
+con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return os;
}
break;
defau
svn commit: r391301 - /tomcat/connectors/trunk/jni/examples/mkcerts
Author: mturk Date: Tue Apr 4 06:25:40 2006 New Revision: 391301 URL: http://svn.apache.org/viewcvs?rev=391301&view=rev Log: Update year and add export for pkcs12 formatted server certificate. Modified: tomcat/connectors/trunk/jni/examples/mkcerts Modified: tomcat/connectors/trunk/jni/examples/mkcerts URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/examples/mkcerts?rev=391301&r1=391300&r2=391301&view=diff == --- tomcat/connectors/trunk/jni/examples/mkcerts (original) +++ tomcat/connectors/trunk/jni/examples/mkcerts Tue Apr 4 06:25:40 2006 @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 1999-2004 The Apache Software Foundation +# Copyright 1999-2006 The Apache Software Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -100,10 +100,10 @@ organizationalUnitName = Organizational Unit Name organizationalUnitName_value= Apache Tomcat commonName = Common Name -commonName_value= Tomcat Demo Root CA +commonName_value= Apache Tomcat demo root CA commonName_max = 64 emailAddress= Email Address -emailAddress_value = [EMAIL PROTECTED] +emailAddress_value = [EMAIL PROTECTED] emailAddress_max= 40 [ extensions ] subjectKeyIdentifier= hash @@ -149,10 +149,10 @@ organizationalUnitName = Organizational Unit Name organizationalUnitName_value= Apache Tomcat commonName = Common Name -commonName_value= Tomcat Localhost Secure Demo Server +commonName_value= Apache Tomcat localhost secure demo server commonName_max = 64 emailAddress= Email Address -emailAddress_value = [EMAIL PROTECTED] +emailAddress_value = [EMAIL PROTECTED] emailAddress_max= 40 [ extensions ] nsCertType = server @@ -172,6 +172,8 @@ $CA -passin $PASSPHRASE -batch -config ca.cfg -extensions server_cert -policy server_policy -out x.crt -infiles localhost.csr $X509 -in x.crt -out localhost.crt rm -f x.crt +# Create PKCS12 localhost certificate +$OPENSSL pkcs12 -export -passout $PASSPHRASE -passin $PASSPHRASE -in localhost.crt -inkey localhost.key -certfile ca.crt -out localhost.p12 $GENRSA -passout $PASSPHRASE -out user.key -rand .rnd 1024 @@ -188,7 +190,7 @@ commonName_value= Localhost Administrator commonName_max = 64 emailAddress= Email Address -emailAddress_value = [EMAIL PROTECTED] +emailAddress_value = [EMAIL PROTECTED] emailAddress_max= 40 [ extensions ] nsCertType = client,email @@ -208,8 +210,6 @@ $OPENSSL pkcs12 -export -passout $PASSPHRASE -passin $PASSPHRASE -in user.crt -inkey user.key -certfile ca.crt -out user.p12 rm -f ca.cfg -rm -f ca.serial.old -rm -f ca.index.old +rm -f *.old rm -f ca.index.attr -rm -f ca.index.attr.old rm -f .rnd - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r391307 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport: AbstractSender.java ReceiverBase.java bio/BioReceiver.java bio/BioSender.java nio/Ni
Author: fhanik
Date: Tue Apr 4 06:40:11 2006
New Revision: 391307
URL: http://svn.apache.org/viewcvs?rev=391307&view=rev
Log:
Enabled all socket options for both receiving and sending sockets
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioSender.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java?rev=391307&r1=391306&r2=391307&view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
Tue Apr 4 06:40:11 2006
@@ -50,6 +50,12 @@
private int port;
private int maxRetryAttempts = 2;//zero resends
private int attempt;
+private boolean tcpNoDelay = true;
+private boolean soKeepAlive;
+private boolean ooBInline;
+private boolean soReuseAddress;
+private boolean soLingerOn;
+private int soLingerTime;
public AbstractSender() {
}
@@ -161,6 +167,30 @@
return attempt;
}
+public boolean getTcpNoDelay() {
+return tcpNoDelay;
+}
+
+public boolean getSoKeepAlive() {
+return soKeepAlive;
+}
+
+public boolean getOoBInline() {
+return ooBInline;
+}
+
+public boolean getSoReuseAddress() {
+return soReuseAddress;
+}
+
+public boolean getSoLingerOn() {
+return soLingerOn;
+}
+
+public int getSoLingerTime() {
+return soLingerTime;
+}
+
public void setKeepAliveCount(int keepAliveCount) {
this.keepAliveCount = keepAliveCount;
}
@@ -195,5 +225,29 @@
public void setAttempt(int attempt) {
this.attempt = attempt;
+}
+
+public void setTcpNoDelay(boolean tcpNoDelay) {
+this.tcpNoDelay = tcpNoDelay;
+}
+
+public void setSoKeepAlive(boolean soKeepAlive) {
+this.soKeepAlive = soKeepAlive;
+}
+
+public void setOoBInline(boolean ooBInline) {
+this.ooBInline = ooBInline;
+}
+
+public void setSoReuseAddress(boolean soReuseAddress) {
+this.soReuseAddress = soReuseAddress;
+}
+
+public void setSoLingerOn(boolean soLingerOn) {
+this.soLingerOn = soLingerOn;
+}
+
+public void setSoLingerTime(int soLingerTime) {
+this.soLingerTime = soLingerTime;
}
}
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=391307&r1=391306&r2=391307&view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
Tue Apr 4 06:40:11 2006
@@ -59,6 +59,12 @@
private int autoBind = 10;
private int maxThreads = 25;
private int minThreads = 6;
+private boolean tcpNoDelay;
+private boolean soKeepAlive;
+private boolean ooBInline;
+private boolean soResuseAddress;
+private boolean soLingerOn;
+private int soLingerTime;
public ReceiverBase() {
}
@@ -247,6 +253,30 @@
return minThreads;
}
+public boolean getTcpNoDelay() {
+return tcpNoDelay;
+}
+
+public boolean getSoKeepAlive() {
+return soKeepAlive;
+}
+
+public boolean getOoBInline() {
+return ooBInline;
+}
+
+public boolean getSoResuseAddress() {
+return soResuseAddress;
+}
+
+public boolean getSoLingerOn() {
+return soLingerOn;
+}
+
+public int getSoLingerTime() {
+return soLingerTime;
+}
+
public void setTcpSelectorTimeout(long selTimeout) {
tcpSelectorTimeout = selTimeout;
}
@@ -286,5 +316,29 @@
public void setMinThreads(int minThreads) {
this.minThreads =
svn commit: r391312 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport: AbstractSender.java ReceiverBase.java bio/BioReceiver.java bio/BioSender.java nio/Ni
Author: fhanik
Date: Tue Apr 4 06:53:31 2006
New Revision: 391312
URL: http://svn.apache.org/viewcvs?rev=391312&view=rev
Log:
More defaults and socket values
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioSender.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java?rev=391312&r1=391311&r2=391312&view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
Tue Apr 4 06:53:31 2006
@@ -51,11 +51,12 @@
private int maxRetryAttempts = 2;//zero resends
private int attempt;
private boolean tcpNoDelay = true;
-private boolean soKeepAlive;
-private boolean ooBInline;
-private boolean soReuseAddress;
-private boolean soLingerOn;
-private int soLingerTime;
+private boolean soKeepAlive = false;
+private boolean ooBInline = true;
+private boolean soReuseAddress = true;
+private boolean soLingerOn = true;
+private int soLingerTime = 3;
+private int soTrafficClass = 0x04 | 0x08 | 0x010;
public AbstractSender() {
}
@@ -191,6 +192,10 @@
return soLingerTime;
}
+public int getSoTrafficClass() {
+return soTrafficClass;
+}
+
public void setKeepAliveCount(int keepAliveCount) {
this.keepAliveCount = keepAliveCount;
}
@@ -249,5 +254,9 @@
public void setSoLingerTime(int soLingerTime) {
this.soLingerTime = soLingerTime;
+}
+
+public void setSoTrafficClass(int soTrafficClass) {
+this.soTrafficClass = soTrafficClass;
}
}
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=391312&r1=391311&r2=391312&view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
Tue Apr 4 06:53:31 2006
@@ -59,12 +59,14 @@
private int autoBind = 10;
private int maxThreads = 25;
private int minThreads = 6;
-private boolean tcpNoDelay;
-private boolean soKeepAlive;
-private boolean ooBInline;
-private boolean soResuseAddress;
-private boolean soLingerOn;
-private int soLingerTime;
+private boolean tcpNoDelay = true;
+private boolean soKeepAlive = false;
+private boolean ooBInline = true;
+private boolean soReuseAddress = true;
+private boolean soLingerOn = true;
+private int soLingerTime = 3;
+private int soTrafficClass = 0x04 | 0x08 | 0x010;
+
public ReceiverBase() {
}
@@ -265,9 +267,6 @@
return ooBInline;
}
-public boolean getSoResuseAddress() {
-return soResuseAddress;
-}
public boolean getSoLingerOn() {
return soLingerOn;
@@ -277,6 +276,14 @@
return soLingerTime;
}
+public boolean getSoReuseAddress() {
+return soReuseAddress;
+}
+
+public int getSoTrafficClass() {
+return soTrafficClass;
+}
+
public void setTcpSelectorTimeout(long selTimeout) {
tcpSelectorTimeout = selTimeout;
}
@@ -330,9 +337,6 @@
this.ooBInline = ooBInline;
}
-public void setSoResuseAddress(boolean soResuseAddress) {
-this.soResuseAddress = soResuseAddress;
-}
public void setSoLingerOn(boolean soLingerOn) {
this.soLingerOn = soLingerOn;
@@ -340,5 +344,13 @@
public void setSoLingerTime(int soLingerTime) {
this.soLingerTime = soLingerTime;
+}
+
+public void setSoReuseAddress(boolean soReuseAddress) {
+this.soReuseAddress = soReuseAddress;
+}
+
+public void setSoTrafficClass(
mod_jk trunk: wrong version in configure.in?
While playing around with svn checkout of mod_jk trunk (1.2.16-dev) I saw, that in jk/native/configure.in there is still a line VERSION=1.2.14 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r391316 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes: membership/ transport/ transport/bio/ transport/nio/ util/
Author: fhanik Date: Tue Apr 4 07:15:40 2006 New Revision: 391316 URL: http://svn.apache.org/viewcvs?rev=391316&view=rev Log: Remove logging dependency, so that standalone lib can log as well Added: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/util/StringManager.java Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java?rev=391316&r1=391315&r2=391316&view=diff == --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java Tue Apr 4 07:15:40 2006 @@ -22,7 +22,7 @@ import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.MembershipListener; import org.apache.catalina.tribes.MembershipService; -import org.apache.catalina.util.StringManager; +import org.apache.catalina.tribes.util.StringManager; import org.apache.catalina.tribes.util.UUIDGenerator; /** Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=391316&r1=391315&r2=391316&view=diff == --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java Tue Apr 4 07:15:40 2006 @@ -20,7 +20,7 @@ import org.apache.catalina.tribes.ChannelMessage; import org.apache.catalina.tribes.ChannelSender; import org.apache.catalina.tribes.Member; -import org.apache.catalina.util.StringManager; +import org.apache.catalina.tribes.util.StringManager; import org.apache.catalina.tribes.transport.nio.PooledParallelSender; /** Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=391316&r1=391315&r2=391316&view=diff == --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java Tue Apr 4 07:15:40 2006 @@ -30,7 +30,7 @@ import org.apache.catalina.tribes.transport.Constants; import org.apache.catalina.tribes.transport.DataSender; import org.apache.catalina.tribes.transport.SenderState; -import org.apache.catalina.util.StringManager; +import org.apache.catalina.tribes.util.StringManager; import org.apache.catalina.tribes.transport.AbstractSender; /** Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=391316&r1=391315&r2=391316&view=diff == --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java Tue Apr 4 07:15:40 2006 @@ -32,7 +32,7 @@ import org.apache.catalina.tribes.transport.ReceiverBase; import org.apache.catalina.tribes.transport.ThreadPool; import org.apache.catalina.tribes.transport.WorkerThread; -import org.apache.catalina.util.StringManager; +import org.apache.catalina.tribes.util.StringManager; /** * @author Filip Hanik Added: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/util/StringManager.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/cata
svn commit: r391327 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport: ReceiverBase.java bio/BioReceiver.java nio/NioReceiver.java
Author: fhanik
Date: Tue Apr 4 07:57:49 2006
New Revision: 391327
URL: http://svn.apache.org/viewcvs?rev=391327&view=rev
Log:
Added missing socket options
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=391327&r1=391326&r2=391327&view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
Tue Apr 4 07:57:49 2006
@@ -66,6 +66,7 @@
private boolean soLingerOn = true;
private int soLingerTime = 3;
private int soTrafficClass = 0x04 | 0x08 | 0x010;
+private int timeout = 15000; //15 seconds
public ReceiverBase() {
@@ -284,6 +285,10 @@
return soTrafficClass;
}
+public int getTimeout() {
+return timeout;
+}
+
public void setTcpSelectorTimeout(long selTimeout) {
tcpSelectorTimeout = selTimeout;
}
@@ -352,5 +357,9 @@
public void setSoTrafficClass(int soTrafficClass) {
this.soTrafficClass = soTrafficClass;
+}
+
+public void setTimeout(int timeout) {
+this.timeout = timeout;
}
}
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=391327&r1=391326&r2=391327&view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Tue Apr 4 07:57:49 2006
@@ -146,6 +146,7 @@
socket.setReuseAddress(getSoReuseAddress());
socket.setSoLinger(getSoLingerOn(),getSoLingerTime());
socket.setTrafficClass(getSoTrafficClass());
+socket.setSoTimeout(getTimeout());
ObjectReader reader = new ObjectReader(socket);
thread.serviceSocket(socket,reader);
}//while
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=391327&r1=391326&r2=391327&view=diff
==
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Tue Apr 4 07:57:49 2006
@@ -178,6 +178,7 @@
channel.socket().setReuseAddress(getSoReuseAddress());
channel.socket().setSoLinger(getSoLingerOn(),getSoLingerTime());
channel.socket().setTrafficClass(getSoTrafficClass());
+channel.socket().setSoTimeout(getTimeout());
Object attach = new ObjectReader(channel);
registerChannel(selector,
channel,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_jk trunk: wrong version in configure.in?
Rainer Jung wrote: While playing around with svn checkout of mod_jk trunk (1.2.16-dev) I saw, that in jk/native/configure.in there is still a line VERSION=1.2.14 Right, but it's irrelevant. We have jk_version.h. I think this was meant to be used for packaging tasks that BTW doesn't exist. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_jk trunk: wrong version in configure.in?
If you run automake, it's still brought in, so necessary to keep it in sync. Mladen Turk wrote: Rainer Jung wrote: While playing around with svn checkout of mod_jk trunk (1.2.16-dev) I saw, that in jk/native/configure.in there is still a line VERSION=1.2.14 Right, but it's irrelevant. We have jk_version.h. I think this was meant to be used for packaging tasks that BTW doesn't exist. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] . - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r391370 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Author: remm
Date: Tue Apr 4 10:19:42 2006
New Revision: 391370
URL: http://svn.apache.org/viewcvs?rev=391370&view=rev
Log:
- Update poweredby.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=391370&r1=391369&r2=391370&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Tue Apr 4 10:19:42 2006
@@ -136,7 +136,7 @@
}
if (connector.getXpoweredBy()) {
-response.addHeader("X-Powered-By", "Servlet/2.4");
+response.addHeader("X-Powered-By", "Servlet/2.5");
}
try {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
TC6 documentation
The current doc scheme of writing in abstract XML and converting to HTML was fine for its day. But now that all modern browsers can render XHTML directly, could we do the TC6 docs directly in XHTML? It would certainly simplify building. We could use jsp:include to include common elements :-) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: TC6 documentation
There were other reasons for using XML, like the ability for Jakarta to have some common elements that would get automagically resolved into the bug tracking URLs, etc. For example, when I edit the changelog it's great to just put in n and have it be resolved to the proper Bugzilla link URL. I think it cuts down on typos, broken links, etc. And this is just one example of a useful custom element out of several. Yoav On 4/4/06, Ian Darwin <[EMAIL PROTECTED]> wrote: > The current doc scheme of writing in abstract XML and converting to HTML > was fine for its day. But now that all modern browsers can render XHTML > directly, > could we do the TC6 docs directly in XHTML? It would certainly simplify > building. > We could use jsp:include to include common elements :-) > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- Yoav Shapira Nimalex LLC 1 Mifflin Place, Suite 310 Cambridge, MA, USA [EMAIL PROTECTED] / www.yoavshapira.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_jk trunk: wrong version in configure.in?
William A. Rowe, Jr. wrote: If you run automake, it's still brought in, so necessary to keep it in sync. Exactly, I was using buildconf.sh and the wrong version went into the Makefile and portable.h. From portable.h it looks like it's going nowhere, the one in the Makefile seems to be relevent for distribution building, which Mladen said does not exist. So we might be able to throw it out completely. Mladen Turk wrote: Rainer Jung wrote: While playing around with svn checkout of mod_jk trunk (1.2.16-dev) I saw, that in jk/native/configure.in there is still a line VERSION=1.2.14 Right, but it's irrelevant. We have jk_version.h. I think this was meant to be used for packaging tasks that BTW doesn't exist. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: TC6 documentation
Yoav Shapira wrote: There were other reasons for using XML, like the ability for Jakarta to have some common elements that would get automagically resolved into the bug tracking URLs, etc. For example, when I edit the changelog it's great to just put in n and have it be resolved to the proper Bugzilla link URL. I think it cuts down on typos, broken links, etc. And this is just one example of a useful custom element out of several. Right you are, thanks. And am I right that eating our own dog food - using JSP tags for that - is out because we want to maintain statically-usable copies? OTOH it might be a better demo of Tomcat :-) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: TC6 documentation
Hola, > Right you are, thanks. And am I right that eating our own dog food - > using JSP tags for that - is out because we want to maintain > statically-usable copies? Yes, you're right. The docs is indexed, searched all over the place, people bookmark their local docs, etc, etc. > OTOH it might be a better demo > of Tomcat :-) Please feel free to add demos and examples at your leisure ;) Yoav - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r391432 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/ catalina/core/ catalina/deploy/ catalina/startup/ tomcat/util/digester/
Author: remm
Date: Tue Apr 4 15:34:09 2006
New Revision: 391432
URL: http://svn.apache.org/viewcvs?rev=391432&view=rev
Log:
- Add support for multiple servlet and filter mappings.
- Fix a bug I found by accident where application listeners are not
reinitialized when reloading.
- That's all folks, all the useful Servlet 2.5 features are done. Now the
annotations ... (sigh)
- Reuse the ignoreAnnotations field name from the patch submitted by Fabien
Carrion.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/FilterMap.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java?rev=391432&r1=391431&r2=391432&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java Tue Apr 4
15:34:09 2006
@@ -259,6 +259,21 @@
/**
+ * Return the boolean on the annotations parsing.
+ */
+public boolean getIgnoreAnnotations();
+
+
+/**
+ * Set the boolean on the annotations parsing for this web
+ * application.
+ *
+ * @param ignoreAnnotations The boolean on the annotations parsing
+ */
+public void setIgnoreAnnotations(boolean ignoreAnnotations);
+
+
+/**
* Return the login configuration descriptor for this web application.
*/
public LoginConfig getLoginConfig();
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=391432&r1=391431&r2=391432&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Tue Apr 4 15:34:09 2006
@@ -212,7 +212,30 @@
return (false);
// Match on context relative request path
-String testPath = filterMap.getURLPattern();
+String[] testPaths = filterMap.getURLPatterns();
+
+for (int i = 0; i < testPaths.length; i++) {
+if (matchFiltersURL(testPaths[i], requestPath)) {
+return (true);
+}
+}
+
+// No match
+return (false);
+
+}
+
+
+/**
+ * Return true if the context-relative request path
+ * matches the requirements of the specified filter mapping;
+ * otherwise, return false.
+ *
+ * @param testPath URL mapping being checked
+ * @param requestPath Context-relative request path of this request
+ */
+private boolean matchFiltersURL(String testPath, String requestPath) {
+
if (testPath == null)
return (false);
@@ -268,11 +291,13 @@
if (servletName == null) {
return (false);
} else {
-if (servletName.equals(filterMap.getServletName())) {
-return (true);
-} else {
-return false;
+String[] servletNames = filterMap.getServletNames();
+for (int i = 0; i < servletNames.length; i++) {
+if (servletName.equals(servletNames[i])) {
+return (true);
+}
}
+return false;
}
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=391432&r1=391431&r2=391432&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue
Apr 4 15:34:09 2006
@@ -301,7 +301,7 @@
private boolean delegate = false;
- /**
+/**
* The display name of this web application.
*/
private String displayName = null;
@@ -360,6 +360,12 @@
/**
+ * Ignore annotations.
+ */
+private boolean ignoreAnnotations = false;
+
+
+/**
* The set of classnames of InstanceListeners that will be added
* to each newly created Wrapper by createWrapper().
*/
@@ -1301,6 +1307,28 @@
/**
+ * Return the boolean on the annotations
svn commit: r391433 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
Author: remm
Date: Tue Apr 4 15:46:41 2006
New Revision: 391433
URL: http://svn.apache.org/viewcvs?rev=391433&view=rev
Log:
- Fix a bug I found by accident where application listeners are not
reinitialized when reloading.
- Port patch.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?rev=391433&r1=391432&r2=391433&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
Tue Apr 4 15:46:41 2006
@@ -4446,7 +4446,6 @@
lifecycle.fireLifecycleEvent(DESTROY_EVENT, null);
instanceListeners = new String[0];
-applicationListeners = new String[0];
}
private void resetContext() throws Exception, MBeanRegistrationException {
@@ -4459,6 +4458,10 @@
// Bugzilla 32867
distributable = false;
+
+applicationListeners = new String[0];
+applicationEventListenersObjects = new Object[0];
+applicationLifecycleListenersObjects = new Object[0];
if(log.isDebugEnabled())
log.debug("resetContext " + oname + " " + mserver);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
