Changeset 810

Timestamp:

12/11/08 23:43:05 (12 months ago)

Author:

hachi

Message:

Allow zero byte content-length PUT requests

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• lib/Perlbal/ClientHTTP.pm (modified) (4 diffs)
• t/20-put.t (modified) (3 diffs)

trunk/CHANGES

@@ +1 @@
+    -- Allow zero byte PUT requests (in normal PUT situations)
 
     -- Fix for serving files from the filesystem over SSL (Greg Denton) 

trunk/lib/Perlbal/ClientHTTP.pm

@@ -146 +146 @@
     # bigger than any specified max put size
     return $self->send_response(400, "Content-length of $clen is invalid.")
-        if !$clen ||
+        if ! defined($clen) ||
+        $clen < 0 ||
         ($self->{service}->{max_put_size} &&
          $clen > $self->{service}->{max_put_size});
 
-    # if we have some data already from a header over-read, note it
-    if (defined $self->{read_ahead} && $self->{read_ahead} > 0) {
+    # if we are supposed to read data and have some data already from a header over-read, note it
+    if ($clen && defined $self->{read_ahead} && $self->{read_ahead} > 0) {
         $self->{content_length_remain} -= $self->{read_ahead};
     }
@@ -228 +229 @@
 
     my $disk_path = $self->{service}->{docroot} . '/' . $path;
-    $self->start_put_open($disk_path, $filename);
 
     $self->{chunked_upload_state} = Perlbal::ChunkedUploadState->new(%{{
@@ -268 +268 @@
         },
     }});
+
+    $self->start_put_open($disk_path, $filename);
 
     return 1;
@@ -396 +398 @@
         $self->{put_fh_filename} = "$path/$file";
 
+        # We just opened the file, haven't read_ahead any bytes, are expecting 0 bytes for read and we're
+        # not in chunked mode, so close the file immediately, we're done.
+        unless ($self->{read_ahead} || $self->{content_length_remain} || $self->{chunked_upload_state}) {
+            # FIXME this should be done through AIO
+            $self->put_close;
+            return;
+        }
+
         $self->put_writeout;
     });

trunk/t/20-put.t

@@ -2 +2 @@
 
 use strict;
+use warnings;
+
 use Perlbal::Test;
 
@@ -36 +38 @@
 
 sub put_file {
+    my %opts = @_;
     my $req = HTTP::Request->new(PUT => $url);
     $content = "foo bar baz\n" x 1000;
+
+    if (exists $opts{content}) {
+        $content = $opts{content}
+    }
+
     $req->content($content);
+
+    if (my $headers = $opts{headers}) {
+        $req->header(@$headers);
+    }
+
     my $res = $ua->request($req);
     return $res->is_success;
@@ -83 +96 @@
     ok(put_file(), "aio $mode: good put at dir1/dir2/foo.txt");
     verify_put();
+    ok(put_file(content => "", headers => [ "Content-Length" => 0 ]), "aio $mode: zero byte file put");
+    verify_put();
     ok(unlink($disk_file), "rm file");
     ok(rmdir("$dir/$dir1/dir2"), "rm dir2");