DO NOT REPLY [Bug 42409] Extra response headers not sent when using custom error page
https://issues.apache.org/bugzilla/show_bug.cgi?id=42409 --- Comment #24 from Hayden James <[EMAIL PROTECTED]> 2008-11-03 18:47:27 PST --- Great, I'm glad to see this fix, I had given up hope last year and started using jetty since that didn't have this issue. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46121] "resources" ant task clashes with ant 1.7 "resources" element
https://issues.apache.org/bugzilla/show_bug.cgi?id=46121 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 15:51:31 PST --- Thanks for the report. this has been fixed in trunk and 6.0.x and will be in 6.0.19 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r711129 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/manager-howto.xml
Author: markt Date: Mon Nov 3 15:51:06 2008 New Revision: 711129 URL: http://svn.apache.org/viewvc?rev=711129&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=46121 Add note re naming clash with new Ant resources datatype Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 3 15:51:06 2008 @@ -1 +1 @@ -/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,698012,698227,698236,698613 +/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,698012,698227,698236,698613,711126 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=711129&r1=711128&r2=711129&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Nov 3 15:51:06 2008 @@ -228,6 +228,11 @@ 46067: Fix typos in Advanced IO how to. (markt) +46121: Add note to manager documentation regarding possible +naming clash with new Ant 1.7 resources datatype and how to avoid it. +(markt) + + Remove unsed parameters from Native/APR example connector configuration in docs. (markt) Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=711129&r1=711128&r2=711129&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Mon Nov 3 15:51:06 2008 @@ -976,6 +976,11 @@ +Note: The definition of the resources task above will override the resources +datatype added in Ant 1.7. If you wish to use the resources datatype you will +need to use Ant's namespace support to assign the Tomcat tasks to their own +namespace. + Now, you can execute commands like ant deploy to deploy the application to a running instance of Tomcat, or ant reload to tell Tomcat to reload it. Note also that most of the interesting values in - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r711126 - /tomcat/trunk/webapps/docs/manager-howto.xml
Author: markt Date: Mon Nov 3 15:47:38 2008 New Revision: 711126 URL: http://svn.apache.org/viewvc?rev=711126&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46121 Add note about resources clash and using namespaces to resolve it. Modified: tomcat/trunk/webapps/docs/manager-howto.xml Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=711126&r1=711125&r2=711126&view=diff == --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Mon Nov 3 15:47:38 2008 @@ -976,6 +976,11 @@ +Note: The definition of the resources task above will override the resources +datatype added in Ant 1.7. If you wish to use the resources datatype you will +need to use Ant's namespace support to assign the Tomcat tasks to their own +namespace. + Now, you can execute commands like ant deploy to deploy the application to a running instance of Tomcat, or ant reload to tell Tomcat to reload it. Note also that most of the interesting values in - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r711125 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/docs/changelog.xml webapps/docs/monitoring.xml
Author: markt Date: Mon Nov 3 15:44:55 2008 New Revision: 711125 URL: http://svn.apache.org/viewvc?rev=711125&view=rev Log: Fix bug 46035. Correct typos in monitoring doc. Doc change only. No need for vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=711125&r1=711124&r2=711125&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 3 15:44:55 2008 @@ -252,12 +252,6 @@ +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46035 - Lots and lots of typos - http://svn.apache.org/viewvc?rev=709823&view=rev - +1: markt - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42409 Use resetBuffer() as suggested by the spec. Makes custom and standard error page handling consistent Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=711125&r1=711124&r2=711125&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Nov 3 15:44:55 2008 @@ -222,6 +222,9 @@ in JNDI how to. (markt) +46035: Fix multiple typos in monitoring how to. (markt) + + 46067: Fix typos in Advanced IO how to. (markt) Modified: tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml?rev=711125&r1=711124&r2=711125&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml Mon Nov 3 15:44:55 2008 @@ -32,9 +32,9 @@ - Monitoring is a very important question today. Looking inside the running -server, grab some statistic data or reconfigure some aspects are -daliy adminstration tasks. + Monitoring is a key aspect of system administration. Looking inside a + running server, obtaining some statistics or reconfiguring some aspects of + an application are all daily administration tasks. @@ -44,8 +44,8 @@ http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html";> http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html. -For quick installation you find here a short installation guide: -Add the following parameters to your tomcat startup script: +The following is a quick configuration guide for Java 5: +Add the following parameters to your Tomcat startup script: set CATALINA_OPTS="-Dcom.sun.management.jmxremote \ -Dcom.sun.management.jmxremote.port=%my.jmx.port% \ @@ -55,14 +55,14 @@ -When you think authorisation is a good, add and change this : +If you require authorisation, add and change this : -Dcom.sun.management.jmxremote.authenticate=true \ -Dcom.sun.management.jmxremote.password.file=../conf/jmxremote.password \ -Dcom.sun.management.jmxremote.access.file=../conf/jmxremote.access \ -edit the access allow file $CATALINA_BASE/conf/jmxremote.access : +edit the access authorisation file $CATALINA_BASE/conf/jmxremote.access : monitorRole readonly controlRole readwrite @@ -73,48 +73,21 @@ monitorRole tomcat controlRole tomcat -Tipp: Password File must be readonly and not accessable from every -other user! Remove all other users under windows to access this file. +Tip: The password file should be read-only and only accessible by the +operating system user Tomcat is running as. -Note:The JSR 160 JMX-Adaptor opens a second data protocol port. That is a problem -when you have installed a local firewall. - -Activate JMX MX4J Http Adaptor with Java 1.4: - - Install the tomcat compat package - Install the mx4j-tools.jar at common/lib. Please, use the same MX4j - version as your tomcat release - Configure a MX4J JMX HTTP Adaptor at your AJP Connector - - -- - - Tipp: With ${AJP.PORT}=0 no ajp connection where started. - - Note: MX4J JSR 160 RMI Adaptor to support JDK 1.4 currently not integrated. - - - Start your tomcat and look with a browser at http://${JMX.HOST}:${JMX.PORT} - With the mx conn
DO NOT REPLY [Bug 46035] Grammar / Spelling in monitoring.html
https://issues.apache.org/bugzilla/show_bug.cgi?id=46035 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 15:29:41 PST --- The change has been ported to 6.0.x and will be in 6.0.19 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[ANN] Apache Tomcat JK 1.2.27 Web Server Connector released
The Apache Tomcat team is pleased to announce the immediate availability of version 1.2.27 of the Apache Tomcat Connectors. It contains connectors, which allow a web server such as Apache HTTPD, Microsoft IIS and Sun Web Server to act as a front end to the Tomcat web application server. This version contains several enhancements, like e.g. - Watchdog Thread - Improved Connection Probing - Mount Extensions - Better IIS Support - Enhanced Status Worker and also fixes a number of minor bugs. See http://tomcat.apache.org/connectors-doc/news/20081001.html#28%20October%20-%20JK-1.2.27%20released for a more detailed description and http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html for a complete list of changes. Source distribtions can be downloaded from an Apache Software Foundation mirror at: http://tomcat.apache.org/download-connectors.cgi Binary distributions for a number of different operating systems and web servers can be downloaded from an Apache Software Foundation mirror at: http://tomcat.apache.org/download-connectors.cgi Syncing the release to the download mirrors might take up to 48 hours. Documentation for using Apache Tomcat Connectors can be found at: http://tomcat.apache.org/connectors-doc/ Thank you, -- The Apache Tomcat Team - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46047] Issue when using include directive inside tag files that are inside jar files
https://issues.apache.org/bugzilla/show_bug.cgi?id=46047 --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 14:53:23 PST --- This has been applied to trunk and proposed for 6.0.x. Many thanks for the patch. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710208 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Nov 3 14:53:01 2008 New Revision: 710208 URL: http://svn.apache.org/viewvc?rev=710208&view=rev Log: Propose fix for 46047 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=710208&r1=710207&r2=710208&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 3 14:53:01 2008 @@ -278,3 +278,10 @@ http://people.apache.org/~markt/patches/2008-11-03-invoker.patch +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46047 + Include jar in path for dependencies if they are in a JAR + Patch provided by Cdric Mailleux + http://svn.apache.org/viewvc?rev=710205&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710205 - /tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
Author: markt
Date: Mon Nov 3 14:47:26 2008
New Revision: 710205
URL: http://svn.apache.org/viewvc?rev=710205&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46047
Include jar in path for dependencies if they are in a JAR
Patch provided by Cédric Mailleux
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=710205&r1=710204&r2=710205&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Mon Nov
3 14:47:26 2008
@@ -192,7 +192,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) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710183 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Nov 3 14:00:52 2008 New Revision: 710183 URL: http://svn.apache.org/viewvc?rev=710183&view=rev Log: Propose invoker deprecation Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=710183&r1=710182&r2=710183&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 3 14:00:52 2008 @@ -273,3 +273,8 @@ http://svn.apache.org/viewvc?rev=710066&view=rev +1: markt -1: + +* Deprecate the invoker servlet ready for its removal in 7.0.x + http://people.apache.org/~markt/patches/2008-11-03-invoker.patch + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710179 - in /tomcat/trunk: ./ conf/ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ java/org/apache/catal
Author: markt Date: Mon Nov 3 13:52:42 2008 New Revision: 710179 URL: http://svn.apache.org/viewvc?rev=710179&view=rev Log: Remove the invoker servlet and all references for security reasons. This will not be proposed for backport to 6.0.x Removed: tomcat/trunk/java/org/apache/catalina/servlets/InvokerHttpRequest.java tomcat/trunk/java/org/apache/catalina/servlets/InvokerServlet.java tomcat/trunk/webapps/docs/funcspecs/fs-invoker.xml Modified: tomcat/trunk/RELEASE-NOTES tomcat/trunk/conf/web.xml tomcat/trunk/java/org/apache/catalina/Globals.java tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties tomcat/trunk/webapps/docs/funcspecs/fs-default.xml tomcat/trunk/webapps/docs/funcspecs/project.xml tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java tomcat/trunk/webapps/examples/WEB-INF/web.xml Modified: tomcat/trunk/RELEASE-NOTES URL: http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=710179&r1=710178&r2=710179&view=diff == --- tomcat/trunk/RELEASE-NOTES (original) +++ tomcat/trunk/RELEASE-NOTES Mon Nov 3 13:52:42 2008 @@ -34,7 +34,6 @@ * Enabling SSI and CGI Support * Security manager URLs * Symlinking static resources -* Enabling invoker servlet * Viewing the Tomcat Change Log * When all else fails @@ -165,19 +164,6 @@ the check. -= -Enabling invoker servlet: -= -Starting with Tomcat 4.1.12, the invoker servlet is no longer available by -default in all webapps. Enabling it for all webapps is possible by editing -$CATALINA_HOME/conf/web.xml to uncomment the "/servlet/*" servlet-mapping -definition. - -Using the invoker servlet in a production environment is not recommended and -is unsupported. More details are available on the Tomcat FAQ at -http://tomcat.apache.org/faq/misc.html#invoker. - - == Viewing the Tomcat Change Log: == Modified: tomcat/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=710179&r1=710178&r2=710179&view=diff == --- tomcat/trunk/conf/web.xml (original) +++ tomcat/trunk/conf/web.xml Mon Nov 3 13:52:42 2008 @@ -102,34 +102,6 @@ - - - - - - - - - - - - - - - - @@ -364,14 +336,6 @@ / - - - jsp Modified: tomcat/trunk/java/org/apache/catalina/Globals.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=710179&r1=710178&r2=710179&view=diff == --- tomcat/trunk/java/org/apache/catalina/Globals.java (original) +++ tomcat/trunk/java/org/apache/catalina/Globals.java Mon Nov 3 13:52:42 2008 @@ -121,15 +121,6 @@ /** - * The request attribute under which the Invoker servlet will store - * the invoking servlet path, if it was used to execute a servlet - * indirectly instead of through a servlet mapping. - */ -public static final String INVOKED_ATTR = -"org.apache.catalina.INVOKED"; - - -/** * The request attribute under which we expose the value of the *value associated with this servlet, * if any. Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=710179&r1=710178&r2=710179&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Mon Nov 3 13:52:42 2008 @@ -823,9 +823,6 @@ while (current != null) { if(state.hrequest == null && (current instanceof HttpServletRequest)) state
[Tomcat Wiki] Trivial Update of "SupportAndTraining" by AdamFitzGerald
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The following page has been changed by AdamFitzGerald: http://wiki.apache.org/tomcat/SupportAndTraining -- [http://www.springsource.com http://www.springframework.org/sites/all/themes/zen/framework/logo.png] - !SpringSource provides global, 24x7, [http://www.covalent.net/supportservices/tomcat/index.html enterprise support] for production users of Apache Tomcat. !SpringSource employs the leading experts on Apache Tomcat to ensure that support customers can get their questions answered quickly and accurately and that bug fixes are incorporated into the open source code base. + !SpringSource provides global, 24x7, [http://www.covalent.net/supportservices/tomcat/index.html?aw enterprise support] for production users of Apache Tomcat. !SpringSource employs the leading experts on Apache Tomcat to ensure that support customers can get their questions answered quickly and accurately and that bug fixes are incorporated into the open source code base. === Example company name === Use this example as a basis for your entry. New entries should be added just above this example. @@ -20, +20 @@ [http://www.springsource.com http://www.springframework.org/sites/all/themes/zen/framework/logo.png] - !SpringSource provides comprehensive [http://www.springsource.com/training education] on enterprise Java with specific [http://springsource.com/training/apa001/syllabus training] for Apache Tomcat. The four-day, intensive instructor-led training provides practical, hands-on knowledge about installation, configuration, deployment, load balancing and troubleshooting for production systems using Apache Tomcat. + !SpringSource provides comprehensive [http://www.springsource.com/training?aw education] on enterprise Java with specific [http://springsource.com/training/apa001/syllabus?aw training] for Apache Tomcat. The four-day, intensive instructor-led training provides practical, hands-on knowledge about installation, configuration, deployment, load balancing and troubleshooting for production systems using Apache Tomcat. === Example company name === Use this example as a basis for your entry. New entries should be added just above this example. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710126 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Nov 3 10:58:20 2008 New Revision: 710126 URL: http://svn.apache.org/viewvc?rev=710126&view=rev Log: Address Remy's review comment Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=710126&r1=710125&r2=710126&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 3 10:58:20 2008 @@ -262,6 +262,7 @@ Use resetBuffer() as suggested by the spec. Makes custom and standard error page handling consistent http://svn.apache.org/viewvc?rev=710063&view=rev + http://svn.apache.org/viewvc?rev=710125&view=rev +1: markt -1: remm (will cause a major behavior change; I would recommend doing a resetBuffer, plus setting usingOutputStream, usingWriter and isCharacterEncodingSet to false; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710125 - in /tomcat/trunk/java/org/apache/catalina: connector/Response.java core/StandardHostValve.java
Author: markt
Date: Mon Nov 3 10:53:37 2008
New Revision: 710125
URL: http://svn.apache.org/viewvc?rev=710125&view=rev
Log:
As per Remy's review comment, make sure we continue to reset the writer/stream
flags before forwarding to a custom error page.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=710125&r1=710124&r2=710125&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Mon Nov 3
10:53:37 2008
@@ -670,16 +670,38 @@
* been committed
*/
public void resetBuffer() {
+resetBuffer(false);
+}
+
+
+/**
+ * Reset the data buffer and the using Writer/Stream flags but not any
+ * status or header information.
+ *
+ * @param resetWriterStreamFlags true if the internal
+ *usingWriter, usingOutputStream,
+ *isCharacterEncodingSet flags should also be reset
+ *
+ * @exception IllegalStateException if the response has already
+ * been committed
+ */
+public void resetBuffer(boolean resetWriterStreamFlags) {
if (isCommitted())
throw new IllegalStateException
(sm.getString("coyoteResponse.resetBuffer.ise"));
outputBuffer.reset();
+
+if(resetWriterStreamFlags) {
+usingOutputStream = false;
+usingWriter = false;
+isCharacterEncodingSet = false;
+}
}
-
+
/**
* Set the buffer size to be used for this Response.
*
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=710125&r1=710124&r2=710125&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Mon Nov
3 10:53:37 2008
@@ -406,7 +406,7 @@
try {
// Reset the response (keeping the real error code and message)
-response.resetBuffer();
+response.resetBuffer(true);
// Forward control to the specified location
ServletContext servletContext =
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710123 - in /tomcat/site/trunk: docs/download-connectors.html xdocs/download-connectors.xml
Author: rjung Date: Mon Nov 3 10:36:17 2008 New Revision: 710123 URL: http://svn.apache.org/viewvc?rev=710123&view=rev Log: Prepare Tomcat Connectors 1.2.27 Release - update Download page Modified: tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/xdocs/download-connectors.xml Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=710123&r1=710122&r2=710123&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Mon Nov 3 10:36:17 2008 @@ -277,35 +277,35 @@ - -JK 1.2.26 Source Release tar.gz + +JK 1.2.27 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.27/tomcat-connectors-1.2.27-src.tar.gz.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.27/tomcat-connectors-1.2.27-src.tar.gz.md5";>MD5] - -JK 1.2.26 Source Release zip + +JK 1.2.27 Source Release zip (e.g. Windows) -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.27/tomcat-connectors-1.2.27-src.zip.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.27/tomcat-connectors-1.2.27-src.zip.md5";>MD5] @@ -323,7 +323,7 @@ -tomcat-connectors-1.2.26-src.* is signed by Rainer Jung (35C7E942). +tomcat-connectors-1.2.27-src.* is signed by Rainer Jung (35C7E942). @@ -361,19 +361,19 @@ % pgpk -a KEYS -% pgpv tomcat-connectors-1.2.26-src.tar.gz.asc +% pgpv tomcat-connectors-1.2.27-src.tar.gz.asc or % pgp -ka KEYS -% pgp tomcat-connectors-1.2.26-src.tar.gz.asc +% pgp tomcat-connectors-1.2.27-src.tar.gz.asc or % gpg --import KEYS -% gpg --verify tomcat-connectors-1.2.26-src.tar.gz.asc +% gpg --verify tomcat-connectors-1.2.27-src.tar.gz.asc Modified: tomcat/site/trunk/xdocs/download-connectors.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=710123&r1=710122&r2=710123&view=diff == --- tomcat/site/trunk/xdocs/download-connectors.xml (original) +++ tomcat/site/trunk/xdocs/download-connectors.xml Mon Nov 3 10:36:17 2008 @@ -50,28 +50,28 @@ Source (please choose the correct format for your platform) - -JK 1.2.26 Source Release tar.gz + +JK 1.2.27 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.27/tomcat-connectors-1.2.27-src.tar.gz.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.27/tomcat-connectors-1.2.27-src.tar.gz.md5";>MD5] - -JK 1.2.26 Source Release zip + +JK 1.2.27 Source Release zip (e.g. Windows) -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.27/tomcat-connectors-1.2.27-src.zip.asc";>PGP] -
Re: svn commit: r710063 - /tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
Remy Maucherat wrote: > On Mon, 2008-11-03 at 14:28 +, [EMAIL PROTECTED] wrote: >> Author: markt >> Date: Mon Nov 3 06:28:17 2008 >> New Revision: 710063 >> >> URL: http://svn.apache.org/viewvc?rev=710063&view=rev >> Log: >> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42409 >> The spec says reset the buffer, therefore use the resetBuffer() method. This >> makes custom and standard error handling consistent. > > The flags for writer and output streams are no longer reset. This means > an ISE in many cases. Is that what you want ? Probably not. I'll look into this more carefully today. > Personally, I don't think the spec's language should be followed here. It is ambiguous but I am in favour of standard error pages and custom error pages behaving in as similar a way as possible. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] bayeux module
On Sun, 2008-11-02 at 06:22 -0700, Filip Hanik - Dev Lists wrote: > Please select one: > [X] +1 yes move it to the modules directory Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Releasing Tomcat Connectors 1.2.27
Rainer Jung schrieb: > Apache Tomcat Connectors 1.2.27 is: > > [X] Stable - no major issues, no regressions > [ ] Beta - at least one significant issue -- tell us what it is > [ ] Alpha - multiple significant issues -- tell us what they are Closing this vote with my own. The result is: 5 votes +1: Henri, Jean-Frédéric, Jim, Mladen, Rainer No other votes. So the vote has passed and I'll proceed doing the release. Thanks to everyone who helped in testing and/or voted. Regards, Rainer - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Denis LULLIER/Paris est absent(e).
Je serai absent(e) du 30/10/2008 au 05/11/2008. Je répondrai à votre message dès mon retour. En cas d'urgence, vous pouvez contacter Christine Duhau ou Marc-Olivier JOUAN
Re: [VOTE] Releasing Tomcat Connectors 1.2.27
Rainer Jung wrote: Hello to the Tomcat team, JK 1.2.27 has been available for testing for two weeks as a svn snapshot. Several bugs have been found and fixed. So I would like to proceed with the release vote. If you want to take a look, the final source distribution can be downloaded from: http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/source/jk-1.2.27/ The updated documentation can be found at http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/docs/jk-1.2.27/ Some binaries will be soon available under http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/binaries/ I'm right now uploading some Linux and Solaris binaries, Mladen will most likely provide Windows binaries. Feel free to provide further binaries. This time the release does contain some major improvements. A comprehensive list is available at http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/docs/jk-1.2.27/news/20081001.html So here's the vote. It will be closed on Monday November 3rd, 2:00 p.m. GMT. Apache Tomcat Connectors 1.2.27 is: [X] Stable - no major issues, no regressions Cheers Jean-Frederic [ ] Beta - at least one significant issue -- tell us what it is [ ] Alpha - multiple significant issues -- tell us what they are Thank you, Rainer - 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]
Re: svn commit: r710063 - /tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
On Mon, 2008-11-03 at 14:28 +, [EMAIL PROTECTED] wrote: > Author: markt > Date: Mon Nov 3 06:28:17 2008 > New Revision: 710063 > > URL: http://svn.apache.org/viewvc?rev=710063&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42409 > The spec says reset the buffer, therefore use the resetBuffer() method. This > makes custom and standard error handling consistent. The flags for writer and output streams are no longer reset. This means an ISE in many cases. Is that what you want ? Personally, I don't think the spec's language should be followed here. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710078 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Mon Nov 3 07:00:57 2008 New Revision: 710078 URL: http://svn.apache.org/viewvc?rev=710078&view=rev Log: - Vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=710078&r1=710077&r2=710078&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 3 07:00:57 2008 @@ -263,7 +263,9 @@ page handling consistent http://svn.apache.org/viewvc?rev=710063&view=rev +1: markt - -1: + -1: remm (will cause a major behavior change; I would recommend doing a resetBuffer, + plus setting usingOutputStream, usingWriter and isCharacterEncodingSet to false; + seriously, this sort of "fix" really needs to stop in the 6.0.x branch) * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861 Add major version number to Tomcat service name created by Windows installer - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710074 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Nov 3 06:51:16 2008 New Revision: 710074 URL: http://svn.apache.org/viewvc?rev=710074&view=rev Log: Propose recent fixes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=710074&r1=710073&r2=710074&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 3 06:51:16 2008 @@ -257,3 +257,16 @@ http://svn.apache.org/viewvc?rev=709823&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42409 + Use resetBuffer() as suggested by the spec. Makes custom and standard error + page handling consistent + http://svn.apache.org/viewvc?rev=710063&view=rev + +1: markt + -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861 + Add major version number to Tomcat service name created by Windows installer + http://svn.apache.org/viewvc?rev=710066&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] bayeux module
Filip Hanik - Dev Lists schrieb: > now that we do have a module directory, I'd like to propose to take the > bayeux impl out of tomcat core, and put it into an individual module > > reasons > 1. It's built on top of Tomcat, but its not core tomcat > 2. We can release it more frequently to fix bugs > 3. If there is a bug in Bayeux, we don't need a new tomcat release > > Please select one: > [X] +1 yes move it to the modules directory Rainer - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41509] Jasper tries to add permissions to readonly PermissionCollection
https://issues.apache.org/bugzilla/show_bug.cgi?id=41509 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Component|Jasper |Examples Resolution||WONTFIX --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 06:35:38 PST --- Without those added permissions, a web application is likely to fail. It may be possible for some applications to operate without these permissions and the failure to add the permission isn't - on its own - sufficient to prevent the application from starting. Therefore, this issue will not be addressed. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41861] Tomcat Windows installer behaves unexpectedly
https://issues.apache.org/bugzilla/show_bug.cgi?id=41861 --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 06:32:39 PST --- I changed the service name to "Apache Tomcat 6". The full version number is still displayed in the description. This has been fixed in trunk and proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710066 - /tomcat/trunk/res/tomcat.nsi
Author: markt Date: Mon Nov 3 06:31:59 2008 New Revision: 710066 URL: http://svn.apache.org/viewvc?rev=710066&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861 Change service name from "Apache Tomcat" to "Apache Tomcat 6". Full version number is still present in the description. Modified: tomcat/trunk/res/tomcat.nsi Modified: tomcat/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=710066&r1=710065&r2=710066&view=diff == --- tomcat/trunk/res/tomcat.nsi (original) +++ tomcat/trunk/res/tomcat.nsi Mon Nov 3 06:31:59 2008 @@ -171,7 +171,7 @@ InstallRetry: ClearErrors - nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName "Apache Tomcat" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\tomcat6.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"' + nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName "Apache Tomcat 6" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\tomcat6.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"' Pop $0 StrCmp $0 "0" InstallOk MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43683] Accessing Servlet while Reloading context gives 404 error
https://issues.apache.org/bugzilla/show_bug.cgi?id=43683 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Comment #24 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 06:30:13 PST --- *** Bug 42518 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42518] Intermittent 404
https://issues.apache.org/bugzilla/show_bug.cgi?id=42518 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution||DUPLICATE --- Comment #4 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 06:30:13 PST --- I am marking this as a duplicate of 43683 as that would explain this bug and there is no information that suggests an alternative cause. If further information is available, please feel free to re-open this issue. *** This bug has been marked as a duplicate of bug 43683 *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42678] docBase ignored even if its not a subdir of appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=42678 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 06:29:43 PST --- This was fixed in r677709 ( https://svn.apache.org/viewcvs.cgi?view=rev&rev=677709 ) and was included in 6.0.18 onwards -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43338] Setting '*' as the servlet-name in filter-mapping causes IllegalArgumentException.
https://issues.apache.org/bugzilla/show_bug.cgi?id=43338 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 06:29:12 PST --- *** Bug 42683 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42683] Can't use '*' for web.xml filter-mapping's servlet-name or url-mapping
https://issues.apache.org/bugzilla/show_bug.cgi?id=42683 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 06:29:12 PST --- *** This bug has been marked as a duplicate of bug 43338 *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42409] Extra response headers not sent when using custom error page
https://issues.apache.org/bugzilla/show_bug.cgi?id=42409 --- Comment #23 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 06:28:34 PST --- After some further review, this has been fixed in trunk and proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r710063 - /tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
Author: markt
Date: Mon Nov 3 06:28:17 2008
New Revision: 710063
URL: http://svn.apache.org/viewvc?rev=710063&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42409
The spec says reset the buffer, therefore use the resetBuffer() method. This
makes custom and standard error handling consistent.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=710063&r1=710062&r2=710063&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Mon Nov
3 06:28:17 2008
@@ -368,7 +368,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,16 +405,8 @@
request.setPathInfo(errorPage.getLocation());
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();
// Forward control to the specified location
ServletContext servletContext =
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] bayeux module
Filip Hanik - Dev Lists wrote: now that we do have a module directory, I'd like to propose to take the bayeux impl out of tomcat core, and put it into an individual module reasons 1. It's built on top of Tomcat, but its not core tomcat 2. We can release it more frequently to fix bugs 3. If there is a bug in Bayeux, we don't need a new tomcat release Please select one: [X] +1 yes move it to the modules directory Cheers Jean-Frederic [ ] 0 I fine either way [ ] -1 Let's discuss before we make a move Filip - 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]
DO NOT REPLY [Bug 42446] Condition is likely to fail in org.apache.tomcat.util.digester.Digester
https://issues.apache.org/bugzilla/show_bug.cgi?id=42446 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Version|6.0.11 |6.0.16 --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-03 06:23:56 PST --- This was also spotted by FindBugs. This has been fixed in trunk (by changing IntrospectionUtils.replaceProperties() and proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r709018 - in /tomcat/trunk/java/org/apache/juli: AsyncFileHandler.java FileHandler.java
On 29/10/2008, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
> Author: fhanik
> Date: Wed Oct 29 14:41:09 2008
> New Revision: 709018
>
> URL: http://svn.apache.org/viewvc?rev=709018&view=rev
> Log:
> Add asynchronous log handling, feature not yet complete. Need to figure out
> when to stop the logger thread (possible when there are no loggers) and also
> make sure the thread sleep/wakeup is bullet proof
>
>
> Added:
> tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
> Modified:
> tomcat/trunk/java/org/apache/juli/FileHandler.java
>
> Added: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=709018&view=auto
>
> ==
> --- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (added)
> +++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Wed Oct 29
> 14:41:09 2008
> @@ -0,0 +1,217 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.juli;
> +
> +import java.util.concurrent.ConcurrentLinkedQueue;
> +import java.util.concurrent.atomic.AtomicLong;
> +import java.util.concurrent.locks.Condition;
> +import java.util.concurrent.locks.ReentrantLock;
> +import java.util.logging.LogRecord;
> +/**
> + *
> + * @author Filip Hanik
> + *
> + */
> +public class AsyncFileHandler extends FileHandler {
> +
> +public static final int OVERFLOW_DROP_LAST = 1;
> +public static final int OVERFLOW_DROP_FIRST = 2;
> +public static final int DEFAULT_MAX_RECORDS = 1000;
> +public static final int RECORD_BATCH_COUNT =
> Integer.parseInt(System.getProperty("org.apache.juli.AsyncRecordBatchCount","100"));
> +
> +protected static ConcurrentLinkedQueue handlers = new
> ConcurrentLinkedQueue();
> +protected static SignalAtomicLong recordCounter = new
> SignalAtomicLong();
> +protected static LoggerThread logger = new LoggerThread();
> +
It would be safer to make the above final, if possible. If not
possible, then there are probably thread-safety issues.
> +static {
> +logger.start();
> +}
> +
> +protected LogQueue queue = new LogQueue();
Ditto.
> +protected boolean closed = false;
Probably needs to be volatile - else all accesses need to be sych.
> +
> +public AsyncFileHandler() {
> +this(null,null,null);
> +}
> +
> +public AsyncFileHandler(String directory, String prefix, String suffix)
> {
> +super(directory, prefix, suffix);
> +open();
> +}
> +
> +@Override
> +public void close() {
> +closed = true;
> +// TODO Auto-generated method stub
> +super.close();
> +handlers.remove(this);
> +}
> +
> +@Override
> +protected void open() {
> +closed = false;
> +// TODO Auto-generated method stub
> +super.open();
> +handlers.add(this);
> +}
> +
> +
> +@Override
> +public void publish(LogRecord record) {
> +if (!isLoggable(record)) {
> +return;
> +}
> +this.queue.offer(record);
> +}
> +
> +protected void publishInternal(LogRecord record) {
> +recordCounter.addAndGet(-1);
> +super.publish(record);
> +}
> +
> +@Override
> +protected void finalize() throws Throwable {
> +// TODO Auto-generated method stub
> +super.finalize();
> +}
> +
> +public int getMaxRecords() {
> +return this.queue.max;
> +}
> +
> +public void setMaxRecords(int maxRecords) {
> +this.queue.max = maxRecords;
> +}
> +
> +public int getOverflowAction() {
> +return this.queue.type;
> +}
> +
> +public void setOverflowAction(int type) {
> +this.queue.type = type;
> +}
> +
> +protected static class SignalAtomicLong {
> +AtomicLong delegate = new AtomicLong(0);
> +ReentrantLock lock = new ReentrantLock();
> +Condition cond = lock.newCondition();
> +
> +public long addAndGet(
DO NOT REPLY [Bug 45989] Deployer fails when copy of large war to webapps/ is slow
https://issues.apache.org/bugzilla/show_bug.cgi?id=45989 --- Comment #4 from Sebb <[EMAIL PROTECTED]> 2008-11-03 01:49:05 PST --- (In reply to comment #3) > A work around that would reduce, but not eliminate the chances of this > happening is: > - upload the war to a different directory > - copy the war locally which should be a lot faster Surely a rename (rather than a copy) would eliminate the timing window entirely? If the file already exists then a delete (or rename and later delete) of the original file would be needed. This would leave a brief window where the file did not exist, but that should be easier to deal with. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
