JBossWeb SVN: r1946 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-02-03 11:30:55 -0500 (Fri, 03 Feb 2012)
New Revision: 1946
Added:
tags/JBOSSWEB_7_0_10_FINAL/
Log:
Web 7.0.10.
12 years, 10 months
JBossWeb SVN: r1945 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-02-03 11:19:27 -0500 (Fri, 03 Feb 2012)
New Revision: 1945
Modified:
trunk/webapps/docs/changelog.xml
Log:
Changelog update.
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2012-02-03 16:11:23 UTC (rev 1944)
+++ trunk/webapps/docs/changelog.xml 2012-02-03 16:19:27 UTC (rev 1945)
@@ -22,6 +22,13 @@
<fix>
Port some additional valves and filters. (remm)
</fix>
+ <fix>
+ <jboss-jira>AS7-3562</jboss-jira>: Add basic all roles mode configuration, just in case.
+ Uses the org.apache.catalina.realm.RealmBase.ALL_ROLES_MODE system property. (remm)
+ </fix>
+ <fix>
+ <jboss-jira>AS7-2877</jboss-jira>: Add a possible fix for NPEs on some requests on stop. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
12 years, 10 months
JBossWeb SVN: r1944 - trunk/java/org/apache/catalina/connector.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-02-03 11:11:23 -0500 (Fri, 03 Feb 2012)
New Revision: 1944
Modified:
trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Log:
AS7-2877: Add a possible fix for NPEs on some requests on stop.
Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-02-03 15:22:01 UTC (rev 1943)
+++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-02-03 16:11:23 UTC (rev 1944)
@@ -346,6 +346,12 @@
}
+ // Check if the connector was stopped
+ if (connector.getService() == null) {
+ res.setStatus(500);
+ return;
+ }
+
if (connector.getXpoweredBy()) {
response.addHeader("X-Powered-By", X_POWERED_BY);
}
12 years, 10 months
JBossWeb SVN: r1943 - trunk/java/org/apache/catalina/realm.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-02-03 10:22:01 -0500 (Fri, 03 Feb 2012)
New Revision: 1943
Modified:
trunk/java/org/apache/catalina/realm/RealmBase.java
Log:
AS7-3282: Add basic workaround allowing all roles mode config.
Modified: trunk/java/org/apache/catalina/realm/RealmBase.java
===================================================================
--- trunk/java/org/apache/catalina/realm/RealmBase.java 2012-02-03 09:23:02 UTC (rev 1942)
+++ trunk/java/org/apache/catalina/realm/RealmBase.java 2012-02-03 15:22:01 UTC (rev 1943)
@@ -161,7 +161,8 @@
/**
* The all role mode.
*/
- protected AllRolesMode allRolesMode = AllRolesMode.STRICT_MODE;
+ protected AllRolesMode allRolesMode = AllRolesMode.toMode(System.getProperty("org.apache.catalina.realm.RealmBase.ALL_ROLES_MODE",
+ AllRolesMode.STRICT_MODE.name));
// ------------------------------------------------------------- Properties
12 years, 10 months
JBossWeb SVN: r1942 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-02-03 04:23:02 -0500 (Fri, 03 Feb 2012)
New Revision: 1942
Modified:
trunk/java/org/apache/jasper/compiler/Generator.java
trunk/webapps/docs/changelog.xml
Log:
AS7-3562: Fix leak on invalid tag pooling when JSP id consumer is used. Submitted by Stuart Douglas.
Modified: trunk/java/org/apache/jasper/compiler/Generator.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Generator.java 2012-02-02 16:24:19 UTC (rev 1941)
+++ trunk/java/org/apache/jasper/compiler/Generator.java 2012-02-03 09:23:02 UTC (rev 1942)
@@ -2264,8 +2264,7 @@
if (n.implementsBodyTag()) {
out.printin("if (");
out.print(tagEvalVar);
- out
- .println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE) {");
+ out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE) {");
// Assume EVAL_BODY_BUFFERED
out.pushIndent();
out.printil("out = _jspx_page_context.pushBody();");
@@ -2354,8 +2353,7 @@
syncScriptingVars(n, VariableInfo.AT_BEGIN);
syncScriptingVars(n, VariableInfo.NESTED);
- out
- .printil("if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)");
+ out.printil("if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)");
out.pushIndent();
out.printil("break;");
out.popIndent();
@@ -2369,8 +2367,7 @@
if (n.implementsBodyTag()) {
out.printin("if (");
out.print(tagEvalVar);
- out
- .println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE) {");
+ out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE) {");
out.pushIndent();
out.printil("out = _jspx_page_context.popBody();");
if (n.implementsTryCatchFinally()) {
@@ -2390,8 +2387,7 @@
out.printin("if (");
out.print(tagHandlerVar);
- out
- .println(".doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {");
+ out.println(".doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {");
out.pushIndent();
if (!n.implementsTryCatchFinally()) {
if (isPoolingEnabled && !(n.implementsJspIdConsumer())) {
@@ -2437,7 +2433,7 @@
out.println(".doFinally();");
}
- if (isPoolingEnabled) {
+ if (isPoolingEnabled && !(n.implementsJspIdConsumer())) {
out.printin(n.getTagHandlerPoolName());
out.print(".reuse(");
out.print(tagHandlerVar);
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2012-02-02 16:24:19 UTC (rev 1941)
+++ trunk/webapps/docs/changelog.xml 2012-02-03 09:23:02 UTC (rev 1942)
@@ -30,6 +30,10 @@
Disable Java identifier check by default (set org.apache.el.parser.SKIP_IDENTIFIER_CHECK to
false to enable it back). (remm)
</fix>
+ <fix>
+ <jboss-jira>AS7-3562</jboss-jira>: Fix leak on invalid tag pooling when JSP id consumer is used.
+ Submitted by Stuart Douglas. (remm)
+ </fix>
</changelog>
</subsection>
</section>
12 years, 10 months
JBossWeb SVN: r1941 - trunk/webapps/docs/config.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2012-02-02 11:24:19 -0500 (Thu, 02 Feb 2012)
New Revision: 1941
Modified:
trunk/webapps/docs/config/native.xml
Log:
Add a section about threads and benchs...
Modified: trunk/webapps/docs/config/native.xml
===================================================================
--- trunk/webapps/docs/config/native.xml 2012-02-02 10:42:42 UTC (rev 1940)
+++ trunk/webapps/docs/config/native.xml 2012-02-02 16:24:19 UTC (rev 1941)
@@ -52,6 +52,19 @@
</section>
+<section name="Threads">
+ <p>If you try to bench native you should remember that the number of active threads is limited to 32 x number of processors.
+ Most of the tests tools are not realistic: they make the requests synchronously (and with no wait time) so the max number of
+ active threads could be reached quickly. Once it is reached the socket connections are closed.
+ In case you want the connector to wait for an available thread you can set org.apache.tomcat.util.net.Constants.WAIT_FOR_THREAD
+ to true. For example in standalone.xml:
+ </p>
+<source>
+ <system-properties>
+ <property name="org.apache.tomcat.util.net.Constants.WAIT_FOR_THREAD" value="true"/>
+ </system-properties>
+</source>
+</section>
</body>
12 years, 10 months
JBossWeb SVN: r1940 - in trunk/webapps/docs: config and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2012-02-02 05:42:42 -0500 (Thu, 02 Feb 2012)
New Revision: 1940
Modified:
trunk/webapps/docs/config/http.xml
trunk/webapps/docs/config/native.xml
trunk/webapps/docs/connectors.xml
Log:
Add max-sessions and threads explaination.
Modified: trunk/webapps/docs/config/http.xml
===================================================================
--- trunk/webapps/docs/config/http.xml 2012-01-30 15:17:31 UTC (rev 1939)
+++ trunk/webapps/docs/config/http.xml 2012-02-02 10:42:42 UTC (rev 1940)
@@ -86,6 +86,13 @@
If not specified, this attribute is set to 4096 (4 kilobytes).</p>
</attribute>
+ <attribute name="max-connections" required="false">
+ <p>Max of connections supported by the connector. That is the max number of threads
+ when using the JIO connector and the end point poller size for all connectors.
+ for the native connector the max number of threads is calculated (32 times the
+ number of processors available to the Java virtual machine.).</p>
+ </attribute>
+
<attribute name="protocol" required="false">
<p>
Sets the protocol to handle incoming traffic.
Modified: trunk/webapps/docs/config/native.xml
===================================================================
--- trunk/webapps/docs/config/native.xml 2012-01-30 15:17:31 UTC (rev 1939)
+++ trunk/webapps/docs/config/native.xml 2012-02-02 10:42:42 UTC (rev 1940)
@@ -29,6 +29,19 @@
<p>See <a href="http.html">http connector</a> for the Common Attributes</p>
+ <attributes>
+ <attribute name="max-connections" required="false">
+ <p>Max of connections supported by the connector.
+ That is the end point poller size and the size of the sendfile poller too.
+ The default values depend on the OS and on org.apache.tomcat.util.Constants.LOW_MEMORY.</p>
+ <p>LOW_MEMORY=true : 1024</p>
+ <p>LOW_MEMORY=false : 32768</p>
+ <p>windows: 1024 Note that also the maximum support by the platform.</p>
+ <p>Note that the max number of threads is calculated and it is 32 times the
+ number of processors available to the Java virtual machine. (32 in case org.apache.tomcat.util.Constants.LOW_MEMORY=true)</p>
+ </attribute>
+ </attributes>
+
</subsection>
</section>
Modified: trunk/webapps/docs/connectors.xml
===================================================================
--- trunk/webapps/docs/connectors.xml 2012-01-30 15:17:31 UTC (rev 1939)
+++ trunk/webapps/docs/connectors.xml 2012-02-02 10:42:42 UTC (rev 1940)
@@ -52,8 +52,6 @@
</ul>
</p>
-<p><b>Other native connectors supporting AJP may work, but are no longer supported.</b></p>
-
</section>
</body>
12 years, 10 months