You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2013/02/04 22:05:44 UTC
svn commit: r1442355 - in /tomcat/tc6.0.x/branches/tomcat6-testing: ./
STATUS.txt java/javax/servlet/http/HttpServletResponse.java
java/org/apache/naming/java/javaURLContextFactory.java
webapps/docs/changelog.xml
Author: kkolinko
Date: Mon Feb 4 21:05:44 2013
New Revision: 1442355
URL: http://svn.apache.org/viewvc?rev=1442355&view=rev
Log:
Catching up with tc6.0.x/trunk
Merged revisions 1410001-1417000 from tc6.0.x/trunk.
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/ (props changed)
tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt
tomcat/tc6.0.x/branches/tomcat6-testing/java/javax/servlet/http/HttpServletResponse.java
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/naming/java/javaURLContextFactory.java
tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/branches/tomcat6-testing/
------------------------------------------------------------------------------
Reverse-merged /tomcat/tc6.0.x/trunk:r1224802
Merged /tomcat/trunk:r1413552,1413556,1413562
Merged /tomcat/tc7.0.x/trunk:r1413553,1413557,1413563
Merged /tomcat/tc6.0.x/trunk:r1410001-1417000
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt?rev=1442355&r1=1442354&r2=1442355&view=diff
==============================================================================
--- tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt Mon Feb 4 21:05:44 2013
@@ -105,14 +105,14 @@ PATCHES PROPOSED TO BACKPORT:
do the change before displaying the login form.
http://svn.apache.org/viewvc?view=revision&revision=1408044
(r1408043 in trunk)
- +1: kkolinko
+ +1: kkolinko, kfujino
-1:
* Introduce property "tomcat.output" that is used to specify location of
the build output directory. This simplifies build configuration when the
output directory is located outside of the source tree.
http://svn.apache.org/viewvc?view=revision&revision=1408376
- +1: kkolinko
+ +1: kkolinko, kfujino
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54087
@@ -120,7 +120,13 @@ PATCHES PROPOSED TO BACKPORT:
header rather than throwing an exception.
http://svn.apache.org/viewvc?view=revision&revision=1408254
(r1408248 in trunk, by markt)
- +1: kkolinko
+ +1: kkolinko, kfujino
+ -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54220
+ ErrorReportValve invoked on non-error responses
+ http://svn.apache.org/viewvc?rev=1416537&view=rev (ErrorReportValve.java only)
+ +1: markt, kfujino
-1:
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/java/javax/servlet/http/HttpServletResponse.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/java/javax/servlet/http/HttpServletResponse.java?rev=1442355&r1=1442354&r2=1442355&view=diff
==============================================================================
--- tomcat/tc6.0.x/branches/tomcat6-testing/java/javax/servlet/http/HttpServletResponse.java (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/java/javax/servlet/http/HttpServletResponse.java Mon Feb 4 21:05:44 2013
@@ -131,41 +131,41 @@ public interface HttpServletResponse ext
public String encodeRedirectUrl(String url);
/**
- * Sends an error response to the client using the specified
- * status. The server defaults to creating the
- * response to look like an HTML-formatted server error page
- * containing the specified message, setting the content type
- * to "text/html", leaving cookies and other headers unmodified.
- *
- * If an error-page declaration has been made for the web application
- * corresponding to the status code passed in, it will be served back in
- * preference to the suggested msg parameter.
- *
- * <p>If the response has already been committed, this method throws
- * an IllegalStateException.
- * After using this method, the response should be considered
- * to be committed and should not be written to.
- *
- * @param sc the error status code
- * @param msg the descriptive message
- * @exception IOException If an input or output exception occurs
- * @exception IllegalStateException If the response was committed
+ * Sends an error response to the client using the specified status code and
+ * clears the output buffer. The server defaults to creating the response to
+ * look like an HTML-formatted server error page containing the specified
+ * message, setting the content type to "text/html", leaving cookies and
+ * other headers unmodified. If an error-page declaration has been made for
+ * the web application corresponding to the status code passed in, it will
+ * be served back in preference to the suggested msg parameter.
+ * <p>
+ * If the response has already been committed, this method throws an
+ * IllegalStateException. After using this method, the response should be
+ * considered to be committed and should not be written to.
+ *
+ * @param sc
+ * the error status code
+ * @param msg
+ * the descriptive message
+ * @exception IOException
+ * If an input or output exception occurs
+ * @exception IllegalStateException
+ * If the response was committed
*/
public void sendError(int sc, String msg) throws IOException;
/**
- * Sends an error response to the client using the specified status
- * code and clearing the buffer.
- * <p>If the response has already been committed, this method throws
- * an IllegalStateException.
- * After using this method, the response should be considered
- * to be committed and should not be written to.
- *
- * @param sc the error status code
- * @exception IOException If an input or output exception occurs
- * @exception IllegalStateException If the response was committed
- * before this method call
+ * Sends an error response to the client using the specified status code and
+ * clears the buffer. This is equivalent to calling {@link #sendError(int,
+ * String)} with the same status code and <code>null</code> for the message.
+ *
+ * @param sc
+ * the error status code
+ * @exception IOException
+ * If an input or output exception occurs
+ * @exception IllegalStateException
+ * If the response was committed before this method call
*/
public void sendError(int sc) throws IOException;
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/naming/java/javaURLContextFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/naming/java/javaURLContextFactory.java?rev=1442355&r1=1442354&r2=1442355&view=diff
==============================================================================
--- tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/naming/java/javaURLContextFactory.java (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/naming/java/javaURLContextFactory.java Mon Feb 4 21:05:44 2013
@@ -35,11 +35,11 @@ import org.apache.naming.ContextBindings
* prefix, which can be done by either :
* <ul>
* <li>Adding a
- * java.naming.factory.url.pkgs=org.apache.catalina.util.naming property
+ * java.naming.factory.url.pkgs=org.apache.naming property
* to the JNDI properties file</li>
- * <li>Setting an environment variable named Context.URL_PKG_PREFIXES with
- * its value including the org.apache.catalina.util.naming package name.
- * More detail about this can be found in the JNDI documentation :
+ * <li>Setting an environment variable named Context.URL_PKG_PREFIXES with
+ * its value including the org.apache.naming package name.
+ * More detail about this can be found in the JNDI documentation :
* {@link javax.naming.spi.NamingManager#getURLContext(java.lang.String, java.util.Hashtable)}.</li>
* </ul>
*
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml?rev=1442355&r1=1442354&r2=1442355&view=diff
==============================================================================
--- tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml Mon Feb 4 21:05:44 2013
@@ -43,7 +43,22 @@
<!-- Section names:
General, Catalina, Coyote, Jasper, Cluster, Web applications, Other
-->
-<section name="Tomcat 6.0.36 (jfclere)" rtext="">
+<section name="Tomcat 6.0.37 (jfclere)">
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ <bug>54198</bug>: Clarify that
+ <code>HttpServletResponse.sendError(int)</code> results in an HTML
+ response by default. (markt)
+ </fix>
+ <fix>
+ <bug>54207</bug>: Correct JNDI factory package name in Javadoc for
+ <code>org.apache.naming.java.javaURLContextFactory</code>. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+<section name="Tomcat 6.0.36 (jfclere)" rtext="released 2012-10-19">
<subsection name="Catalina">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org