X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FWebDAV.pm;h=2fa9112b88f91f05b19cf85789e042d48e8de71a;hb=0ab5a3554ba66259932f2721c64a062e2cd00148;hp=09f10e519cd1ebd312be7e6a51d84f0a58b6a008;hpb=fd1e8cc4d43ed344438cb93e203ca146fe243487;p=pr0n diff --git a/perl/Sesse/pr0n/WebDAV.pm b/perl/Sesse/pr0n/WebDAV.pm index 09f10e5..2fa9112 100644 --- a/perl/Sesse/pr0n/WebDAV.pm +++ b/perl/Sesse/pr0n/WebDAV.pm @@ -11,7 +11,7 @@ use Apache2::Upload; sub handler { my $r = shift; my $dbh = Sesse::pr0n::Common::get_dbh(); - + $r->headers_out->{'DAV'} = "1,2"; # We only handle depth=0, depth=1 (cf. the RFC) @@ -405,6 +405,9 @@ EOF my ($event, $autorename, $filename) = ($1, $2, $3); my $size = $r->headers_in->{'content-length'}; + if (!defined($size)) { + $size = $r->headers_in->{'x-expected-entity-length'}; + } my $orig_filename = $filename; # Remove evil characters @@ -423,7 +426,7 @@ EOF # gnome-vfs and mac os x love to make zero-byte files, # make them happy # - if ($r->headers_in->{'content-length'} == 0 || $filename =~ /^\.(_|DS_Store)/) { + if ($size == 0 || $filename =~ /^\.(_|DS_Store)/) { $dbh->do('DELETE FROM fake_files WHERE expires_at <= now() OR (event=? AND vhost=? AND filename=?);', undef, $event, $r->get_server_name, $filename) or dberror($r, "Couldn't prune fake_files"); @@ -436,7 +439,7 @@ EOF $r->log->info("Fake upload of $event/$filename"); return Apache2::Const::OK; } - + # Get the new ID my $ref = $dbh->selectrow_hashref("SELECT NEXTVAL('imageid_seq') AS id;"); my $newid = $ref->{'id'}; @@ -478,8 +481,7 @@ EOF or die "$fname: $!"; my $buf; - my $content_length = $r->headers_in->{'content-length'}; - if ($r->read($buf, $content_length)) { + if ($r->read($buf, $size)) { print NEWFILE $buf or die "write($fname): $!"; } @@ -565,7 +567,7 @@ EOF my $ref = $q->fetchrow_hashref; if ($ref->{'cnt'} == 0) { - my @errors = Sesse::pr0n::Common::add_new_event($dbh, $ne_id, $ne_date, $ne_desc, $r->get_server_name); + my @errors = Sesse::pr0n::Common::add_new_event($r, $dbh, $ne_id, $ne_date, $ne_desc); if (scalar @errors > 0) { die "Couldn't add new event $ne_id: " . join(', ', @errors); }