glenn       01/02/03 16:48:21

  Modified:    catalina/src/share/org/apache/catalina/connector
                        HttpResponseBase.java
  Log:
  Implement SecurityManager
  
  Revision  Changes    Path
  1.27      +21 -20    
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
  
  Index: HttpResponseBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- HttpResponseBase.java     2001/02/03 07:48:31     1.26
  +++ HttpResponseBase.java     2001/02/04 00:48:21     1.27
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
 1.26 2001/02/03 07:48:31 remm Exp $
  - * $Revision: 1.26 $
  - * $Date: 2001/02/03 07:48:31 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
 1.27 2001/02/04 00:48:21 glenn Exp $
  + * $Revision: 1.27 $
  + * $Date: 2001/02/04 00:48:21 $
    *
    * ====================================================================
    *
  @@ -70,6 +70,8 @@
   import java.io.PrintWriter;
   import java.net.MalformedURLException;
   import java.net.URL;
  +import java.security.AccessController;
  +import java.security.PrivilegedAction;
   import java.text.SimpleDateFormat;
   import java.util.ArrayList;
   import java.util.Date;
  @@ -97,7 +99,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.26 $ $Date: 2001/02/03 07:48:31 $
  + * @version $Revision: 1.27 $ $Date: 2001/02/04 00:48:21 $
    */
   
   public class HttpResponseBase
  @@ -528,7 +530,7 @@
        // Prepare a suitable output writer
        OutputStreamWriter osr =
            new OutputStreamWriter(getStream(), getCharacterEncoding());
  -     PrintWriter outputWriter = new PrintWriter(osr);
  +     final PrintWriter outputWriter = new PrintWriter(osr);
   
        // Send the "Status:" header
        outputWriter.print(request.getRequest().getProtocol());
  @@ -546,28 +548,28 @@
        // Send the content-length and content-type headers (if any)
        if (getContentType() != null) {
            outputWriter.print("Content-Type: " + getContentType() + "\r\n");
  -            //            System.out.println(" Content-Type: " + getContentType());
  +            // System.out.println(" Content-Type: " + getContentType());
        }
        if (getContentLength() >= 0) {
            outputWriter.print("Content-Length: " + getContentLength() +
                               "\r\n");
  -            //            System.out.println(" Content-Length: " + 
getContentLength());
  +            // System.out.println(" Content-Length: " + getContentLength());
        }
   
        // Send all specified headers (if any)
        synchronized (headers) {
  -         Iterator names = headers.keySet().iterator();
  -         while (names.hasNext()) {
  -             String name = (String) names.next();
  -             ArrayList values = (ArrayList) headers.get(name);
  -             Iterator items = values.iterator();
  -             while (items.hasNext()) {
  -                 String value = (String) items.next();
  +     Iterator names = headers.keySet().iterator();
  +     while (names.hasNext()) {
  +         String name = (String) names.next();
  +         ArrayList values = (ArrayList) headers.get(name);
  +         Iterator items = values.iterator();
  +         while (items.hasNext()) {
  +             String value = (String) items.next();
                    outputWriter.print(name);
                    outputWriter.print(": ");
                    outputWriter.print(value);
                    outputWriter.print("\r\n");
  -                    //                    System.out.println(" " + name + ": " + 
value);
  +                    // System.out.println(" " + name + ": " + value);
                }
            }
        }
  @@ -602,10 +604,10 @@
                outputWriter.print(": ");
                outputWriter.print(CookieTools.getCookieHeaderValue(cookie));
                outputWriter.print("\r\n");
  -                //                System.out.println(" " +
  -                //                                   
CookieTools.getCookieHeaderName(cookie) +
  -                //                                   ": " +
  -                //                                   
CookieTools.getCookieHeaderValue(cookie));
  +                // System.out.println(" " +
  +                // CookieTools.getCookieHeaderName(cookie) +
  +                //     ": " +
  +                //     CookieTools.getCookieHeaderValue(cookie));
            }
        }
   
  @@ -925,7 +927,6 @@
        * @param url URL to be encoded
        */
       public String encodeURL(String url) {
  -
        if (isEncodeable(toAbsolute(url))) {
            HttpServletRequest hreq =
              (HttpServletRequest) request.getRequest();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to