httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: apache-1.3/src/main http_protocol.c
Date Mon, 29 Mar 2004 18:23:03 GMT
jim         2004/03/29 10:23:03

  Modified:    .        STATUS
               src/main http_protocol.c
  Log:
  Backport fix for ap_set_byterange() which correctly handles
  ErrorDocument
  
  Revision  Changes    Path
  1.1076    +1 -7      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.1075
  retrieving revision 1.1076
  diff -u -r1.1075 -r1.1076
  --- STATUS	29 Mar 2004 18:18:00 -0000	1.1075
  +++ STATUS	29 Mar 2004 18:23:03 -0000	1.1076
  @@ -60,12 +60,6 @@
          http://www.apache.org/~trawick/13_custom_response_patch
           +1: trawick, stoddard
   
  -   * byterange requests with configured ErrorDocuments return 206 instead
  -     of the error code like with 2.0.  looks like some 2.0 logic needs to
  -     backported.
  -       http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=107780510031395&w=2
  -        +1: geoff
  -
      * isn't ap_die() broken with recognizing recursive errors
          Message-Id: <3F8C56E3.8050501@attglobal.net>
           +1: jeff, jim
  
  
  
  1.334     +1 -1      apache-1.3/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
  retrieving revision 1.333
  retrieving revision 1.334
  diff -u -r1.333 -r1.334
  --- http_protocol.c	29 Mar 2004 17:38:01 -0000	1.333
  +++ http_protocol.c	29 Mar 2004 18:23:03 -0000	1.334
  @@ -260,7 +260,7 @@
       if (!(range = ap_table_get(r->headers_in, "Range")))
           range = ap_table_get(r->headers_in, "Request-Range");
   
  -    if (!range || strncasecmp(range, "bytes=", 6)) {
  +    if (!range || strncasecmp(range, "bytes=", 6) || (r->status != HTTP_OK)) {
           return 0;
       }
       range += 6;
  
  
  

Mime
View raw message