You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2001/03/09 00:40:58 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java

remm        01/03/08 15:40:57

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        DefaultServlet.java
  Log:
  - Set content length when doing a single range ranged request. Fixes
    problems with WinAMP 2.72 new HTTP seek feature (which apparently
    doesn't support chunking).
  
  Revision  Changes    Path
  1.27      +8 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
  
  Index: DefaultServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- DefaultServlet.java	2001/02/03 07:48:33	1.26
  +++ DefaultServlet.java	2001/03/08 23:40:55	1.27
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v 1.26 2001/02/03 07:48:33 remm Exp $
  - * $Revision: 1.26 $
  - * $Date: 2001/02/03 07:48:33 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v 1.27 2001/03/08 23:40:55 remm Exp $
  + * $Revision: 1.27 $
  + * $Date: 2001/03/08 23:40:55 $
    *
    * ====================================================================
    *
  @@ -122,7 +122,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.26 $ $Date: 2001/02/03 07:48:33 $
  + * @version $Revision: 1.27 $ $Date: 2001/03/08 23:40:55 $
    */
   
   public class DefaultServlet
  @@ -1301,6 +1301,9 @@
                                     ServletOutputStream ostream,
                                     long start, long end) {
           
  +        if (debug > 10)
  +            System.out.println("Serving bytes:" + start + "-" + end);
  +        
           try {
               istream.skip(start);
           } catch (IOException e) {
  @@ -1632,6 +1635,7 @@
                                      + range.start
                                      + "-" + range.end + "/" 
                                      + range.length);
  +                response.setContentLength((int) range.length);
                   
                   if (contentType != null) {
                       if (debug > 0)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, email: tomcat-dev-help@jakarta.apache.org