You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@hyperreal.org on 1999/11/13 04:59:37 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/security SecurityInterceptor.java
craigmcc 99/11/12 19:59:36
Modified: src/share/org/apache/tomcat/deployment
UserDataConstraint.java
src/share/org/apache/tomcat/security
SecurityInterceptor.java
Log:
Manually resolve the merge conflict on UserDataConstraint. It was caused
by a correction of a variable name on the main branch, coupled with
changes that reflect the 2.2pr2 changes in the <transport-guarantee>
element of the deployment descriptor.
Revision Changes Path
1.3 +5 -4 jakarta-tomcat/src/share/org/apache/tomcat/deployment/UserDataConstraint.java
Index: UserDataConstraint.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/UserDataConstraint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserDataConstraint.java 1999/10/30 18:12:30 1.2
+++ UserDataConstraint.java 1999/11/13 03:59:33 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/UserDataConstraint.java,v 1.2 1999/10/30 18:12:30 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 1999/10/30 18:12:30 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/UserDataConstraint.java,v 1.3 1999/11/13 03:59:33 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 1999/11/13 03:59:33 $
*
* ====================================================================
*
@@ -68,8 +68,9 @@
** @author Danny Coward
*/
public interface UserDataConstraint {
+ public static String NONE_TRANSPORT = "NONE";
public static String INTEGRAL_TRANSPORT = "INTEGRAL";
- public static String SECURE_TRANSPORT = "SECURE";
+ public static String CONFIDENTIAL_TRANSPORT = "CONFIDENTIAL";
public String getDescription();
public void setDescription(String description);
1.2 +3 -3 jakarta-tomcat/src/share/org/apache/tomcat/security/SecurityInterceptor.java
Index: SecurityInterceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/SecurityInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityInterceptor.java 1999/10/31 00:24:33 1.1
+++ SecurityInterceptor.java 1999/11/13 03:59:34 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/SecurityInterceptor.java,v 1.1 1999/10/31 00:24:33 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 1999/10/31 00:24:33 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/security/SecurityInterceptor.java,v 1.2 1999/11/13 03:59:34 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 1999/11/13 03:59:34 $
*
* ====================================================================
*
@@ -492,7 +492,7 @@
if (guarantee == null)
return;
if (guarantee.equals(UserDataConstraint.INTEGRAL_TRANSPORT) ||
- guarantee.equals(UserDataConstraint.SECURE_TRANSPORT)) {
+ guarantee.equals(UserDataConstraint.CONFIDENTIAL_TRANSPORT)) {
if (!req.isSecure()) {
; // XXX - Create error response, throw
; // InterceptorException