craigmcc 01/03/16 16:56:58
Modified: catalina/src/share/org/apache/catalina Globals.java
catalina/src/share/org/apache/catalina/core
StandardWrapperValve.java
Log:
Reflect corrections in the attribute names for cipher suite and key size.
Pass the name of this servlet if we forward to an error page.
Revision Changes Path
1.19 +13 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java
Index: Globals.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Globals.java 2001/01/23 04:45:10 1.18
+++ Globals.java 2001/03/17 00:56:56 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v
1.18 2001/01/23 04:45:10 remm Exp $
- * $Revision: 1.18 $
- * $Date: 2001/01/23 04:45:10 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v
1.19 2001/03/17 00:56:56 craigmcc Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/03/17 00:56:56 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
* Global constants that are applicable to multiple packages within Catalina.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.18 $ $Date: 2001/01/23 04:45:10 $
+ * @version $Revision: 1.19 $ $Date: 2001/03/17 00:56:56 $
*/
public final class Globals {
@@ -90,7 +90,7 @@
* java.lang.String).
*/
public static final String CIPHER_SUITE_ATTR =
- "javax.servlet.request.cipher-suite";
+ "javax.servlet.request.cipher_suite";
/**
@@ -163,7 +163,7 @@
* this SSL connection (as an object of type java.lang.Integer).
*/
public static final String KEY_SIZE_ATTR =
- "javax.servlet.request.key-size";
+ "javax.servlet.request.key_size";
/**
@@ -203,6 +203,13 @@
*/
public static final String SERVER_INFO = "Apache Tomcat/4.0-dev";
+
+ /**
+ * The request attribute under which we forward a servlet name to
+ * an error page.
+ */
+ public static final String SERVLET_NAME_ATTR =
+ "javax.servlet.error.servlet_name";
/**
1.21 +10 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- StandardWrapperValve.java 2001/03/09 05:03:51 1.20
+++ StandardWrapperValve.java 2001/03/17 00:56:57 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
1.20 2001/03/09 05:03:51 remm Exp $
- * $Revision: 1.20 $
- * $Date: 2001/03/09 05:03:51 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
1.21 2001/03/17 00:56:57 craigmcc Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/03/17 00:56:57 $
*
* ====================================================================
*
@@ -102,7 +102,7 @@
* <code>StandardWrapper</code> container implementation.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.20 $ $Date: 2001/03/09 05:03:51 $
+ * @version $Revision: 1.21 $ $Date: 2001/03/17 00:56:57 $
*/
final class StandardWrapperValve
@@ -518,6 +518,9 @@
realError.getMessage());
sreq.setAttribute(Globals.EXCEPTION_ATTR,
realError);
+ Wrapper wrapper = (Wrapper) getContainer();
+ sreq.setAttribute(Globals.SERVLET_NAME_ATTR,
+ wrapper.getName());
if (sreq instanceof HttpServletRequest)
sreq.setAttribute(Globals.EXCEPTION_PAGE_ATTR,
((HttpServletRequest) sreq).getRequestURI());
@@ -796,6 +799,9 @@
new Integer(statusCode));
sreq.setAttribute(Globals.ERROR_MESSAGE_ATTR,
message);
+ Wrapper wrapper = (Wrapper) getContainer();
+ sreq.setAttribute(Globals.SERVLET_NAME_ATTR,
+ wrapper.getName());
if (sreq instanceof HttpServletRequest)
sreq.setAttribute(Globals.EXCEPTION_PAGE_ATTR,
((HttpServletRequest) sreq).getRequestURI());
