JBossWeb SVN: r2253 - tags.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-08-23 11:46:54 -0400 (Fri, 23 Aug 2013)
New Revision: 2253
Added:
tags/JBOSSWEB_7_2_3_FINAL/
Log:
tag and release CapeDarf.
11 years, 4 months
JBossWeb SVN: r2252 - branches/7.2.x.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-08-23 11:41:38 -0400 (Fri, 23 Aug 2013)
New Revision: 2252
Modified:
branches/7.2.x/pom.xml
Log:
release 7.2.3.Final of CapeDarf.
Modified: branches/7.2.x/pom.xml
===================================================================
--- branches/7.2.x/pom.xml 2013-08-23 15:37:32 UTC (rev 2251)
+++ branches/7.2.x/pom.xml 2013-08-23 15:41:38 UTC (rev 2252)
@@ -33,7 +33,7 @@
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.2.2.Final</version>
+ <version>7.2.3.Final</version>
<name>JBoss Web</name>
<description>Servlet 3.0 container</description>
11 years, 4 months
JBossWeb SVN: r2251 - branches/7.2.x/src/main/java/org/apache/catalina/connector.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-08-23 11:37:32 -0400 (Fri, 23 Aug 2013)
New Revision: 2251
Modified:
branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java
branches/7.2.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
Log:
Fix (or work-around) for BZ995411)
Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-08-16 16:38:20 UTC (rev 2250)
+++ branches/7.2.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-08-23 15:37:32 UTC (rev 2251)
@@ -216,7 +216,8 @@
/**
* Flag to use IP-based virtual hosting.
*/
- protected boolean useIPVHosts = false;
+ protected boolean useIPVHosts =
+ Boolean.valueOf(System.getProperty("org.apache.catalina.connector.USE_IP_PORT_FOR_ALIAS", "false")).booleanValue();
/**
* The background thread.
Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2013-08-16 16:38:20 UTC (rev 2250)
+++ branches/7.2.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2013-08-23 15:37:32 UTC (rev 2251)
@@ -492,6 +492,10 @@
// well, they did ask for it
res.action(ActionCode.ACTION_REQ_LOCAL_NAME_ATTRIBUTE, null);
}
+ if (connector.getAllowedHosts() != null && connector.getAllowedHosts().size() == 1) {
+ serverName = serverName.newInstance();
+ serverName.setString(req.localName() + ":" + req.getServerPort());
+ }
} else {
serverName = req.serverName();
}
11 years, 4 months
JBossWeb SVN: r2250 - in branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846: java/org/apache/tomcat/util/net and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: aogburn
Date: 2013-08-16 12:38:20 -0400 (Fri, 16 Aug 2013)
New Revision: 2250
Modified:
branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/
branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/build.xml
branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java
Log:
[JBPAPP-10846] merge fix
Property changes on: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x:2248
Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/build.xml
===================================================================
--- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/build.xml 2013-08-16 16:13:27 UTC (rev 2249)
+++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/build.xml 2013-08-16 16:38:20 UTC (rev 2250)
@@ -843,7 +843,7 @@
<target name="build-jasper-jdt-src">
<jar destfile="${jasper-jdt-src.jar}" index="true">
- <fileset dir="${jasper-jdt-src.home}/src/plugins/org.eclipse.jdt.core/model">
+ <fileset dir="${jasper-jdt-src.home}/plugins/org.eclipse.jdt.core/model">
<include name="org/eclipse/jdt/core/compiler/**"/>
<include name="org/eclipse/jdt/internal/compiler/**"/>
<include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java
===================================================================
--- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-08-16 16:13:27 UTC (rev 2249)
+++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-08-16 16:38:20 UTC (rev 2250)
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.net.BindException;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.concurrent.Executor;
@@ -586,17 +587,18 @@
* Unlock the accept by using a local connection.
*/
protected void unlockAccept() {
- Socket s = null;
+ java.net.Socket s = null;
+ InetSocketAddress saddr = null;
try {
// Need to create a connection to unlock the accept();
if (address == null) {
- s = new Socket("localhost", port);
+ saddr = new InetSocketAddress("localhost", port);
} else {
- s = new Socket(address, port);
- // setting soLinger to a small value will help shutdown the
- // connection quicker
- s.setSoLinger(true, 0);
+ saddr = new InetSocketAddress(address, port);
}
+ s = new java.net.Socket();
+ s.setSoLinger(true, 0);
+ s.connect(saddr, 2000);
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("endpoint.debug.unlock", "" + port), e);
Property changes on: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/java/org/apache/tomcat/util/net/JIoEndpoint.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java:2248
/branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java:2135
11 years, 4 months
JBossWeb SVN: r2249 - branches.
by jbossweb-commits＠lists.jboss.org
Author: aogburn
Date: 2013-08-16 12:13:27 -0400 (Fri, 16 Aug 2013)
New Revision: 2249
Added:
branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10846/
Log:
[JBPAPP-10846] create one-off branch
11 years, 4 months
JBossWeb SVN: r2248 - branches/2.1.x/java/org/apache/tomcat/util/net.
by jbossweb-commits＠lists.jboss.org
Author: aogburn
Date: 2013-08-16 11:52:25 -0400 (Fri, 16 Aug 2013)
New Revision: 2248
Modified:
branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java
Log:
[JBWEB-278] backport from AS7-3834: fix unlockAccept shutdown hang
Modified: branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java
===================================================================
--- branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-08-15 06:34:09 UTC (rev 2247)
+++ branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-08-16 15:52:25 UTC (rev 2248)
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.net.BindException;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.concurrent.Executor;
@@ -586,17 +587,18 @@
* Unlock the accept by using a local connection.
*/
protected void unlockAccept() {
- Socket s = null;
+ java.net.Socket s = null;
+ InetSocketAddress saddr = null;
try {
// Need to create a connection to unlock the accept();
if (address == null) {
- s = new Socket("localhost", port);
+ saddr = new InetSocketAddress("localhost", port);
} else {
- s = new Socket(address, port);
- // setting soLinger to a small value will help shutdown the
- // connection quicker
- s.setSoLinger(true, 0);
+ saddr = new InetSocketAddress(address, port);
}
+ s = new java.net.Socket();
+ s.setSoLinger(true, 0);
+ s.connect(saddr, 2000);
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("endpoint.debug.unlock", "" + port), e);
Property changes on: branches/2.1.x/java/org/apache/tomcat/util/net/JIoEndpoint.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java:2135
11 years, 4 months
JBossWeb SVN: r2246 - branches/7.2.x/src/main/java/org/apache/coyote/ajp.
by jbossweb-commits＠lists.jboss.org
Author: tfonteyn
Date: 2013-08-14 11:12:43 -0400 (Wed, 14 Aug 2013)
New Revision: 2246
Modified:
branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java
branches/7.2.x/src/main/java/org/apache/coyote/ajp/Constants.java
Log:
[bz-997009] allow configuration of requiredSecret attribute on the AJP connector with a system property
Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-08-14 13:14:09 UTC (rev 2245)
+++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-08-14 15:12:43 UTC (rev 2246)
@@ -324,7 +324,7 @@
/**
* Required secret.
*/
- protected String requiredSecret = null;
+ protected String requiredSecret = Constants.DEFAULT_REQUIRED_SECRET;
public void setRequiredSecret(String requiredSecret) { this.requiredSecret = requiredSecret; }
/**
Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2013-08-14 13:14:09 UTC (rev 2245)
+++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2013-08-14 15:12:43 UTC (rev 2246)
@@ -299,7 +299,7 @@
/**
* Required secret.
*/
- protected String requiredSecret = null;
+ protected String requiredSecret = Constants.DEFAULT_REQUIRED_SECRET;
public void setRequiredSecret(String requiredSecret) { this.requiredSecret = requiredSecret; }
/**
Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/Constants.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/coyote/ajp/Constants.java 2013-08-14 13:14:09 UTC (rev 2245)
+++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/Constants.java 2013-08-14 15:12:43 UTC (rev 2246)
@@ -46,7 +46,9 @@
public static final boolean DEFAULT_TCP_NO_DELAY = true;
public static final boolean DEFAULT_TOMCAT_AUTHENTICATION =
Boolean.valueOf(System.getProperty("org.apache.coyote.ajp.DEFAULT_TOMCAT_AUTHENTICATION", "true")).booleanValue();
-
+ public static final String DEFAULT_REQUIRED_SECRET =
+ System.getProperty("org.apache.coyote.ajp.DEFAULT_REQUIRED_SECRET");
+
// Prefix codes for message types from server to container
public static final byte JK_AJP13_FORWARD_REQUEST = 2;
public static final byte JK_AJP13_SHUTDOWN = 7;
11 years, 4 months
JBossWeb SVN: r2245 - branches/8.0.x/src/main/java/org/apache/coyote/ajp.
by jbossweb-commits＠lists.jboss.org
Author: tfonteyn
Date: 2013-08-14 09:14:09 -0400 (Wed, 14 Aug 2013)
New Revision: 2245
Modified:
branches/8.0.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
branches/8.0.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java
branches/8.0.x/src/main/java/org/apache/coyote/ajp/Constants.java
Log:
[WFLY-1589] allow configuration of requiredSecret attribute on the AJP connector with a system property
Modified: branches/8.0.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java
===================================================================
--- branches/8.0.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-08-09 19:44:07 UTC (rev 2244)
+++ branches/8.0.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-08-14 13:14:09 UTC (rev 2245)
@@ -324,7 +324,7 @@
/**
* Required secret.
*/
- protected String requiredSecret = null;
+ protected String requiredSecret = Constants.DEFAULT_REQUIRED_SECRET;
public void setRequiredSecret(String requiredSecret) { this.requiredSecret = requiredSecret; }
/**
Modified: branches/8.0.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java
===================================================================
--- branches/8.0.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2013-08-09 19:44:07 UTC (rev 2244)
+++ branches/8.0.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2013-08-14 13:14:09 UTC (rev 2245)
@@ -299,7 +299,7 @@
/**
* Required secret.
*/
- protected String requiredSecret = null;
+ protected String requiredSecret = Constants.DEFAULT_REQUIRED_SECRET;
public void setRequiredSecret(String requiredSecret) { this.requiredSecret = requiredSecret; }
/**
Modified: branches/8.0.x/src/main/java/org/apache/coyote/ajp/Constants.java
===================================================================
--- branches/8.0.x/src/main/java/org/apache/coyote/ajp/Constants.java 2013-08-09 19:44:07 UTC (rev 2244)
+++ branches/8.0.x/src/main/java/org/apache/coyote/ajp/Constants.java 2013-08-14 13:14:09 UTC (rev 2245)
@@ -46,7 +46,9 @@
public static final boolean DEFAULT_TCP_NO_DELAY = true;
public static final boolean DEFAULT_TOMCAT_AUTHENTICATION =
Boolean.valueOf(System.getProperty("org.apache.coyote.ajp.DEFAULT_TOMCAT_AUTHENTICATION", "true")).booleanValue();
-
+ public static final String DEFAULT_REQUIRED_SECRET =
+ System.getProperty("org.apache.coyote.ajp.DEFAULT_REQUIRED_SECRET");
+
// Prefix codes for message types from server to container
public static final byte JK_AJP13_FORWARD_REQUEST = 2;
public static final byte JK_AJP13_SHUTDOWN = 7;
11 years, 4 months