*** ftp.pm.orig Mon Jul 28 19:25:09 2003 --- ftp.pm Tue Aug 5 14:37:33 2003 *************** *** 247,264 **** my $range_info = $request->header('Range'); # Change bytes=2772992-6781209 to just 2772992 ! my ($start_byte,$end_byte) = $range_info =~ /.*=\s*(\d+)-(\d+)/; ! if (!defined $start_byte || !defined $end_byte || ! ($start_byte < 0) || ($start_byte > $end_byte) || ($end_byte < 0)) ! { ! return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST, ! 'Incorrect syntax for Range request'); } ! $max_size = $end_byte-$start_byte; ! $ftp->restart($start_byte); } elsif ($request->header('Range') && !$ftp->supported('REST')) { --- 247,271 ---- my $range_info = $request->header('Range'); # Change bytes=2772992-6781209 to just 2772992 ! my ($start_byte,$end_byte) = $range_info =~ /.*=\s*(\d+)-(\d+)?/; ! if ( defined $start_byte && !defined $end_byte ) { ! # open range -- only the start is specified ! ! $ftp->restart( $start_byte ); ! # don't define $max_size, we don't want to abort early } + elsif ( defined $start_byte && defined $end_byte && + $start_byte >= 0 && $end_byte >= $start_byte ) { ! $ftp->restart( $start_byte ); ! $max_size = $end_byte - $start_byte; ! } ! else { ! return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST, ! 'Incorrect syntax for Range request'); ! } } elsif ($request->header('Range') && !$ftp->supported('REST')) {