November 2008 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r849 - tags/JBOSSWEB_2_1_1_GA.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-04 10:05:55 -0500 (Tue, 04 Nov 2008) New Revision: 849 Added: tags/JBOSSWEB_2_1_1_GA/build.properties Log: - Add properties file for version numbers. Added: tags/JBOSSWEB_2_1_1_GA/build.properties =================================================================== --- tags/JBOSSWEB_2_1_1_GA/build.properties (rev 0) +++ tags/JBOSSWEB_2_1_1_GA/build.properties 2008-11-04 15:05:55 UTC (rev 849) @@ -0,0 +1,5 @@ +version.major=2 +version.minor=1 +version.build=1 +version.patch=8 +version.tag=GA

16 years, 4 months

1
0
0 / 0

JBossWeb SVN: r848 - tags.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-04 09:57:21 -0500 (Tue, 04 Nov 2008) New Revision: 848 Added: tags/JBOSSWEB_2_1_1_GA/ Log: - JBoss Web 2.1.1 GA. Copied: tags/JBOSSWEB_2_1_1_GA (from rev 847, trunk)

16 years, 4 months

1
0
0 / 0

JBossWeb SVN: r847 - in trunk: webapps/docs and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-04 01:34:01 -0500 (Tue, 04 Nov 2008) New Revision: 847 Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java trunk/webapps/docs/changelog.xml Log: - Tweak the merging of flags for the wakeup attribute. Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-11-03 23:49:56 UTC (rev 846) +++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-11-04 06:34:01 UTC (rev 847) @@ -1159,7 +1159,7 @@ * Socket list class, used to avoid using a possibly large amount of objects * with very little actual use. */ - public class SocketInfo { + public static class SocketInfo { public static final int READ = 1; public static final int WRITE = 2; public static final int RESUME = 4; @@ -1179,6 +1179,12 @@ public boolean wakeup() { return (flags & WAKEUP) == WAKEUP; } + public static int merge(int flag1, int flag2) { + return ((flag1 & READ) | (flag2 & READ)) + | ((flag1 & WRITE) | (flag2 & WRITE)) + | ((flag1 & RESUME) | (flag2 & RESUME)) + | ((flag1 & WAKEUP) & (flag2 & WAKEUP)); + } } @@ -1290,7 +1296,7 @@ } else { for (int i = 0; i < size; i++) { if (sockets[i] == socket) { - flags[i] = flags[i] | flag; + flags[i] = SocketInfo.merge(flags[i], flag); return true; } } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-11-03 23:49:56 UTC (rev 846) +++ trunk/webapps/docs/changelog.xml 2008-11-04 06:34:01 UTC (rev 847) @@ -133,7 +133,8 @@ Refactor generation of the READ event which follows a BEGIN into the HTTP protocol handler. (remm) </fix> <fix> - <jira>124</jira>: Comet instability fixes. (remm) + <jira>124</jira>, <jira>125</jira>: APR instability fixes involving asynchronous resume() + calls. (remm) </fix> <fix> Fix timeout processing in many cases. (remm)

16 years, 4 months

1
0
0 / 0

JBossWeb SVN: r846 - in trunk: java/org/apache/jasper/compiler and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-03 18:49:56 -0500 (Mon, 03 Nov 2008) New Revision: 846 Modified: trunk/PATCHES.txt trunk/java/org/apache/jasper/compiler/ParserController.java trunk/webapps/docs/changelog.xml Log: - Port Jasper patch. Modified: trunk/PATCHES.txt =================================================================== --- trunk/PATCHES.txt 2008-11-03 22:10:24 UTC (rev 845) +++ trunk/PATCHES.txt 2008-11-03 23:49:56 UTC (rev 846) @@ -11,3 +11,6 @@ http://svn.apache.org/viewvc?rev=709018&view=rev Async logger is not ready + +http://svn.apache.org/viewvc?rev=710179&view=rev +Invoker servlet removal Modified: trunk/java/org/apache/jasper/compiler/ParserController.java =================================================================== --- trunk/java/org/apache/jasper/compiler/ParserController.java 2008-11-03 22:10:24 UTC (rev 845) +++ trunk/java/org/apache/jasper/compiler/ParserController.java 2008-11-03 23:49:56 UTC (rev 846) @@ -191,7 +191,12 @@ if (parent != null) { // Included resource, add to dependent list - compiler.getPageInfo().addDependant(absFileName); + if (jarFile == null) { + compiler.getPageInfo().addDependant(absFileName); + } else { + compiler.getPageInfo().addDependant( + jarFileUrl.toExternalForm() + absFileName.substring(1)); + } } if ((isXml && isEncodingSpecifiedInProlog) || isBomPresent) { Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-11-03 22:10:24 UTC (rev 845) +++ trunk/webapps/docs/changelog.xml 2008-11-03 23:49:56 UTC (rev 846) @@ -165,6 +165,10 @@ <fix> Fix regression in Big* types handling. Patch provided by Nils Eckert. (markt) </fix> + <fix> + <bug>46047</bug>: Include jar in path for dependencies if they are in a JAR. + Patch provided by C�dric Mailleux. (markt) + </fix> </changelog> </subsection> <subsection name="Others">

16 years, 4 months

1
0
0 / 0

JBossWeb SVN: r845 - in trunk: java/org/apache/catalina/core and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-03 17:10:24 -0500 (Mon, 03 Nov 2008) New Revision: 845 Modified: trunk/java/org/apache/catalina/connector/Response.java trunk/java/org/apache/catalina/core/StandardHostValve.java trunk/webapps/docs/changelog.xml Log: - Port patch: less heavy handed reset for error pages. Modified: trunk/java/org/apache/catalina/connector/Response.java =================================================================== --- trunk/java/org/apache/catalina/connector/Response.java 2008-11-03 22:01:48 UTC (rev 844) +++ trunk/java/org/apache/catalina/connector/Response.java 2008-11-03 22:10:24 UTC (rev 845) @@ -690,6 +690,30 @@ /** + * Reset the data buffer and the using Writer/Stream flags but not any + * status or header information. + * + * @param resetWriterStreamFlags <code>true</code> if the internal + * <code>usingWriter</code>, <code>usingOutputStream</code>, + * <code>isCharacterEncodingSet</code> flags should also be reset + * + * @exception IllegalStateException if the response has already + * been committed + */ + public void resetBuffer(boolean resetWriterStreamFlags) { + + resetBuffer(); + + if(resetWriterStreamFlags) { + usingOutputStream = false; + usingWriter = false; + isCharacterEncodingSet = false; + } + + } + + + /** * Set the buffer size to be used for this Response. * * @param size The new buffer size Modified: trunk/java/org/apache/catalina/core/StandardHostValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardHostValve.java 2008-11-03 22:01:48 UTC (rev 844) +++ trunk/java/org/apache/catalina/core/StandardHostValve.java 2008-11-03 22:10:24 UTC (rev 845) @@ -367,7 +367,7 @@ if (exception == null) return (null); - Class clazz = exception.getClass(); + Class<?> clazz = exception.getClass(); String name = clazz.getName(); while (!Object.class.equals(clazz)) { ErrorPage errorPage = context.findErrorPage(name); @@ -405,15 +405,8 @@ try { - // Reset the response if possible (else IllegalStateException) - //hres.reset(); // Reset the response (keeping the real error code and message) - Integer statusCodeObj = - (Integer) request.getAttribute(Globals.STATUS_CODE_ATTR); - int statusCode = statusCodeObj.intValue(); - String message = - (String) request.getAttribute(Globals.ERROR_MESSAGE_ATTR); - response.reset(statusCode, message); + response.resetBuffer(true); // Forward control to the specified location ServletContext servletContext = Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-11-03 22:01:48 UTC (rev 844) +++ trunk/webapps/docs/changelog.xml 2008-11-03 22:10:24 UTC (rev 845) @@ -84,6 +84,9 @@ <fix> <bug>46105</bug>: Set query string URI encoding when replaying request. (markt) </fix> + <fix> + Only reset the buffer and usage of IS or writer when forwarding to a custom error page. (markt, remm) + </fix> </changelog> </subsection> <subsection name="Coyote">

16 years, 4 months

1
0
0 / 0

JBossWeb SVN: r844 - in trunk/java/org/apache: tomcat/util/net and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-03 17:01:48 -0500 (Mon, 03 Nov 2008) New Revision: 844 Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java trunk/java/org/apache/coyote/http11/Http11AprProtocol.java trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Log: - Add an extra flag, otherwise async resume() causes problems no matter what I tried. Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-11-03 13:47:06 UTC (rev 843) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-11-03 22:01:48 UTC (rev 844) @@ -1274,14 +1274,14 @@ // An event is being processed already: adding for resume will be done // when the socket gets back to the poller if (!cometProcessing && !resumeNotification) { - endpoint.getCometPoller().add(socket, cometTimeout, false, false, true); + endpoint.getCometPoller().add(socket, cometTimeout, false, false, true, true); } resumeNotification = true; } else if (actionCode == ActionCode.ACTION_COMET_WRITE) { // An event is being processed already: adding for write will be done // when the socket gets back to the poller if (!cometProcessing && !writeNotification) { - endpoint.getCometPoller().add(socket, cometTimeout, false, true, false); + endpoint.getCometPoller().add(socket, cometTimeout, false, true, false, true); } writeNotification = true; } else if (actionCode == ActionCode.ACTION_COMET_TIMEOUT) { Modified: trunk/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2008-11-03 13:47:06 UTC (rev 843) +++ trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2008-11-03 22:01:48 UTC (rev 844) @@ -572,7 +572,7 @@ } else { if (proto.endpoint.isRunning()) { proto.endpoint.getCometPoller().add(socket, result.getCometTimeout(), - result.getReadNotifications(), result.getWriteNotification(), result.getResumeNotification()); + result.getReadNotifications(), result.getWriteNotification(), result.getResumeNotification(), false); } } result.endProcessing(); @@ -603,7 +603,7 @@ state = event(socket, SocketStatus.OPEN_READ); } else { proto.endpoint.getCometPoller().add(socket, processor.getCometTimeout(), - processor.getReadNotifications(), false, false); + processor.getReadNotifications(), false, false, false); } } else { recycledProcessors.offer(processor); Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-11-03 13:47:06 UTC (rev 843) +++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-11-03 22:01:48 UTC (rev 844) @@ -1163,6 +1163,7 @@ public static final int READ = 1; public static final int WRITE = 2; public static final int RESUME = 4; + public static final int WAKEUP = 8; public long socket; public int timeout; public int flags; @@ -1175,6 +1176,9 @@ public boolean resume() { return (flags & RESUME) == RESUME; } + public boolean wakeup() { + return (flags & WAKEUP) == WAKEUP; + } } @@ -1284,6 +1288,12 @@ if (size == sockets.length) { return false; } else { + for (int i = 0; i < size; i++) { + if (sockets[i] == socket) { + flags[i] = flags[i] | flag; + return true; + } + } sockets[size] = socket; timeouts[size] = timeout; flags[size] = flag; @@ -1520,7 +1530,7 @@ * @param write to do write polling * @param resume to send a callback event */ - public void add(long socket, int timeout, boolean read, boolean write, boolean resume) { + public void add(long socket, int timeout, boolean read, boolean write, boolean resume, boolean wakeup) { if (timeout < 0) { timeout = soTimeout; } @@ -1529,7 +1539,8 @@ // Add socket to the list. Newly added sockets will wait // at most for pollTime before being polled if (addList.add(socket, timeout, - (read ? SocketInfo.READ : 0) | (write ? SocketInfo.WRITE : 0) | (resume ? SocketInfo.RESUME : 0))) { + (read ? SocketInfo.READ : 0) | (write ? SocketInfo.WRITE : 0) | (resume ? SocketInfo.RESUME : 0) + | (wakeup ? SocketInfo.WAKEUP : 0))) { ok = true; this.notify(); } @@ -1664,7 +1675,28 @@ } SocketInfo info = localAddList.get(); while (info != null) { - if (info.read() || info.write()) { + if (info.wakeup()) { + // Resume event if socket is present in the poller + if (timeouts.remove(info.socket)) { + removeFromPoller(info.socket); + if (info.resume()) { + if (!processSocket(info.socket, SocketStatus.OPEN_CALLBACK)) { + Socket.destroy(info.socket); + } + } else { + int events = ((info.read()) ? Poll.APR_POLLIN : 0) + | ((info.write()) ? Poll.APR_POLLOUT : 0); + if (!addToPoller(info.socket, events)) { + // Can't do anything: close the socket right away + if (!comet || (comet && !processSocket(info.socket, SocketStatus.ERROR))) { + Socket.destroy(info.socket); + } + } else { + timeouts.add(info.socket, System.currentTimeMillis() + info.timeout); + } + } + } + } else if (info.read() || info.write()) { if (info.resume()) { // Resume event timeouts.remove(info.socket); @@ -1674,7 +1706,6 @@ } } else { // Store timeout - timeouts.add(info.socket, System.currentTimeMillis() + info.timeout); if (comet) { removeFromPoller(info.socket); } @@ -1682,10 +1713,11 @@ | ((info.write()) ? Poll.APR_POLLOUT : 0); if (!addToPoller(info.socket, events)) { // Can't do anything: close the socket right away - timeouts.remove(info.socket); if (!comet || (comet && !processSocket(info.socket, SocketStatus.ERROR))) { Socket.destroy(info.socket); } + } else { + timeouts.add(info.socket, System.currentTimeMillis() + info.timeout); } } } else { @@ -1797,6 +1829,10 @@ // Reallocate the current poller int count = Poll.pollset(pollers[i], desc); long newPoller = allocatePoller(actualPollerSize, pool, -1); + // FIXME: don't restore connections for now, since I have not tested it + pollerSpace[i] = actualPollerSize; + connectionCount -= count; + /* for (int j = 0; j < count; j++) { int events = (int) desc[2*j]; long socket = desc[2*j+1]; @@ -1807,7 +1843,7 @@ if (Poll.add(newPoller, socket, events) != Status.APR_SUCCESS) { // Skip } - } + }*/ Poll.destroy(pollers[i]); pollers[i] = newPoller; }

16 years, 4 months

1
0
0 / 0

JBossWeb SVN: r843 - trunk.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-03 08:47:06 -0500 (Mon, 03 Nov 2008) New Revision: 843 Modified: trunk/PATCHES.txt Log: - Don't port the new logging patches. Modified: trunk/PATCHES.txt =================================================================== --- trunk/PATCHES.txt 2008-11-02 18:39:47 UTC (rev 842) +++ trunk/PATCHES.txt 2008-11-03 13:47:06 UTC (rev 843) @@ -8,3 +8,6 @@ http://svn.apache.org/viewvc?rev=709821&view=rev Endline configuration for PrintWriter based on a server system property + +http://svn.apache.org/viewvc?rev=709018&view=rev +Async logger is not ready

16 years, 4 months

1
0
0 / 0

JBossWeb SVN: r842 - trunk/java/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-02 13:39:47 -0500 (Sun, 02 Nov 2008) New Revision: 842 Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Log: - If processing an ERROR, set the error flag. - Use the error flag to avoid any useless native operations which could be risky given the socket state. Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-11-02 02:39:41 UTC (rev 841) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-11-02 18:39:47 UTC (rev 842) @@ -780,6 +780,9 @@ } else if (status == SocketStatus.OPEN_CALLBACK) { // The resume notification is now done resumeNotification = false; + } else if (status == SocketStatus.ERROR) { + // Set error flag right away + error = true; } containerThread.set(Boolean.TRUE); rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE); @@ -1261,7 +1264,9 @@ // End non blocking mode outputBuffer.setNonBlocking(false); inputBuffer.setNonBlocking(false); - Socket.timeoutSet(socket, endpoint.getSoTimeout() * 1000); + if (!error) { + Socket.timeoutSet(socket, endpoint.getSoTimeout() * 1000); + } } else if (actionCode == ActionCode.ACTION_COMET_SUSPEND) { readNotifications = false; } else if (actionCode == ActionCode.ACTION_COMET_RESUME) {

16 years, 4 months

1
0
0 / 0

JBossWeb SVN: r841 - trunk.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-01 22:39:41 -0400 (Sat, 01 Nov 2008) New Revision: 841 Modified: trunk/PATCHES.txt Log: - Add new dropped patch. Modified: trunk/PATCHES.txt =================================================================== --- trunk/PATCHES.txt 2008-11-02 00:48:35 UTC (rev 840) +++ trunk/PATCHES.txt 2008-11-02 02:39:41 UTC (rev 841) @@ -5,3 +5,6 @@ http://svn.apache.org/viewvc?rev=701355&view=rev XML parser in webapp fix (significant refactoring, partial) + +http://svn.apache.org/viewvc?rev=709821&view=rev +Endline configuration for PrintWriter based on a server system property

16 years, 4 months

1
0
0 / 0

JBossWeb SVN: r840 - trunk/java/org/apache/catalina/manager.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2008-11-01 20:48:35 -0400 (Sat, 01 Nov 2008) New Revision: 840 Modified: trunk/java/org/apache/catalina/manager/LocalStrings.properties Log: - Required param. Modified: trunk/java/org/apache/catalina/manager/LocalStrings.properties =================================================================== --- trunk/java/org/apache/catalina/manager/LocalStrings.properties 2008-11-02 00:46:18 UTC (rev 839) +++ trunk/java/org/apache/catalina/manager/LocalStrings.properties 2008-11-02 00:48:35 UTC (rev 840) @@ -17,7 +17,7 @@ htmlManagerServlet.helpManagerFile=../docs/manager-howto.html htmlManagerServlet.deployButton=Deploy htmlManagerServlet.deployConfig=XML Configuration file URL: -htmlManagerServlet.deployPath=Context Path (optional): +htmlManagerServlet.deployPath=Context Path (required): htmlManagerServlet.deployServer=Deploy directory or WAR file located on server htmlManagerServlet.deployTitle=Deploy htmlManagerServlet.deployUpload=WAR file to deploy

16 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits November 2008