tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup LocalStrings.properties
Date Wed, 18 Oct 2000 04:19:08 GMT
craigmcc    00/10/17 21:19:08

  Modified:    .        RELEASE-NOTES-4.0-M3.txt
               catalina/src/share/org/apache/catalina/authenticator
                        BasicAuthenticator.java
               catalina/src/share/org/apache/catalina/connector
                        HttpRequestBase.java
               catalina/src/share/org/apache/catalina/startup
                        LocalStrings.properties
  Log:
  Correctly record the authentication method to be returned by
  HttpServletRequest.getAuthType().
  
  Revision  Changes    Path
  1.4       +14 -1     jakarta-tomcat-4.0/RELEASE-NOTES-4.0-M3.txt
  
  Index: RELEASE-NOTES-4.0-M3.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.0-M3.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RELEASE-NOTES-4.0-M3.txt	2000/10/17 19:45:23	1.3
  +++ RELEASE-NOTES-4.0-M3.txt	2000/10/18 04:19:06	1.4
  @@ -3,7 +3,7 @@
                               Release Notes
                               =============
   
  -$Id: RELEASE-NOTES-4.0-M3.txt,v 1.3 2000/10/17 19:45:23 craigmcc Exp $
  +$Id: RELEASE-NOTES-4.0-M3.txt,v 1.4 2000/10/18 04:19:06 craigmcc Exp $
   
   
   ============
  @@ -81,7 +81,13 @@
   of RequestDispatcher.forward() now correct resets the buffer (but not the
   headers or cookies) before performing the forwarding.
   
  +Jasper:  Per JSP 1.2 requirements, Jasper now supports the new capability to
  +define a custom tag that iterates without having to create a nested
  +BodyContent object.  This spec change supports improved performance for the
  +(common) case where the nested content of a custom tag is simply rendered to
  +the response anyway, with no need for double buffering.
   
  +
   =========
   BUG FIXES:
   =========
  @@ -144,6 +150,13 @@
   page (or the raw HTML of a static resource) if you appended a "/" or "\"
   character after the name of a valid resource.  Now, these requests return
   NOT FOUND (404).
  +
  +Catalina:  Make the footer of directory listings produced by the default
  +file-serving servlet reflect the same version information that is returned
  +by ServletContext.getServerInfo().
  +
  +Catalina:  Correctly record the authentication method to be returned by
  +HttpServletRequest.getAuthType().
   
   
   ==============================
  
  
  
  1.3       +15 -5     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java
  
  Index: BasicAuthenticator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BasicAuthenticator.java	2000/10/06 05:10:16	1.2
  +++ BasicAuthenticator.java	2000/10/18 04:19:07	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java,v
1.2 2000/10/06 05:10:16 craigmcc Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/10/06 05:10:16 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java,v
1.3 2000/10/18 04:19:07 craigmcc Exp $
  + * $Revision: 1.3 $
  + * $Date: 2000/10/18 04:19:07 $
    *
    * ====================================================================
    *
  @@ -84,7 +84,7 @@
    * and Digest Access Authentication."
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.2 $ $Date: 2000/10/06 05:10:16 $
  + * @version $Revision: 1.3 $ $Date: 2000/10/18 04:19:07 $
    */
   
   public final class BasicAuthenticator
  @@ -144,8 +144,11 @@
   	// Have we already authenticated someone?
   	Principal principal =
   	    ((HttpServletRequest) request.getRequest()).getUserPrincipal();
  -	if (principal != null)
  +	if (principal != null) {
  +            //            if (debug >= 1)
  +            //                log("Already authenticated '" + principal.getName() + "'");
   	    return (true);
  +        }
   
   	// Have we got a cached authenticated Principal?
   	Session session = null;
  @@ -154,6 +157,9 @@
   	if (session != null) {
   	    principal = session.getPrincipal();
   	    if (principal != null) {
  +                //                if (debug >= 1)
  +                //                    log("Cached authentication for '" + principal.getName()
  +                //                        + "'");
   	        request.setAuthType(Constants.BASIC_METHOD);
   		request.setUserPrincipal(principal);
   		return (true);
  @@ -169,6 +175,8 @@
   	if (authorization != null) {
   	    principal = findPrincipal(authorization, context.getRealm());
   	    if (principal != null) {
  +                //                if (debug >= 1)
  +                //                    log("Authenticated '" + principal.getName() + "'");
   	        request.setAuthType(Constants.BASIC_METHOD);
   		request.setUserPrincipal(principal);
   		if (cache && (session != null))
  @@ -182,6 +190,8 @@
   	String realmName = config.getRealmName();
   	if (realmName == null)
   	    realmName = hreq.getServerName() + ":" + hreq.getServerPort();
  +    //        if (debug >= 1)
  +    //            log("Challenging for realm '" + realmName + "'");
   	hres.setHeader("WWW-Authenticate", 
                          "Basic realm=\"" + realmName + "\"");
           hres.setContentLength(0);
  
  
  
  1.11      +6 -6      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java
  
  Index: HttpRequestBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- HttpRequestBase.java	2000/10/17 03:32:51	1.10
  +++ HttpRequestBase.java	2000/10/18 04:19:07	1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.10 2000/10/17 03:32:51 craigmcc Exp $
  - * $Revision: 1.10 $
  - * $Date: 2000/10/17 03:32:51 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
1.11 2000/10/18 04:19:07 craigmcc Exp $
  + * $Revision: 1.11 $
  + * $Date: 2000/10/18 04:19:07 $
    *
    * ====================================================================
    *
  @@ -98,7 +98,7 @@
    * be implemented.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.10 $ $Date: 2000/10/17 03:32:51 $
  + * @version $Revision: 1.11 $ $Date: 2000/10/18 04:19:07 $
    */
   
   public class HttpRequestBase
  @@ -398,9 +398,9 @@
        * set the type to <code>null</code>.  Typical values are "BASIC",
        * "DIGEST", or "SSL".
        *
  -     * @param type The authentication type used
  +     * @param authType The authentication type used
        */
  -    public void setAuthType(String type) {
  +    public void setAuthType(String authType) {
   
   	this.authType = authType;
   
  
  
  
  1.11      +1 -0      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- LocalStrings.properties	2000/10/14 05:21:14	1.10
  +++ LocalStrings.properties	2000/10/18 04:19:08	1.11
  @@ -16,6 +16,7 @@
   contextConfig.defaultMissing=Missing default web.xml, using application web.xml only
   contextConfig.defaultParse=Parse error in default web.xml
   contextConfig.defaultPosition=Occurred at line {0} column {1}
  +contextConfig.missingRealm=No Realm has been configured to authenticate against
   contextConfig.start=ContextConfig: Processing START
   contextConfig.stop=ContextConfig: Processing STOP
   contextConfig.unavailable=Marking this application unavailable due to previous error(s)
  
  
  

Mime
View raw message