HTTP::Body 1.04, patch from jgoulah for tmpdir() accessor

[catagits/HTTP-Body.git] / lib / HTTP / Body / MultiPart.pm

diff --git a/lib/HTTP/Body/MultiPart.pm b/lib/HTTP/Body/MultiPart.pm
index 6e7a21e..78212cf 100644 (file)
--- a/lib/HTTP/Body/MultiPart.pm
+++ b/lib/HTTP/Body/MultiPart.pm
@@ -4,6 +4,7 @@ use strict;
 use base 'HTTP::Body';
 use bytes;
 
+use IO::File;
 use File::Temp 0.14;
 
 =head1 NAME
@@ -88,7 +89,7 @@ sub boundary_end {
 
 =cut
 
-sub crlf {
+sub crlf () {
     return "\x0d\x0a";
 }
 
@@ -256,44 +257,42 @@ sub parse_body {
 sub handler {
     my ( $self, $part ) = @_;
 
-    # skip parts without content
-    if ( $part->{done} && $part->{size} == 0 ) {
-        return 0;
-    }
-
     unless ( exists $part->{name} ) {
 
         my $disposition = $part->{headers}->{'Content-Disposition'};
-        my ($name)     = $disposition =~ / name="?([^\";]+)"?/;
-        my ($filename) = $disposition =~ / filename="?([^\"]+)"?/;
+        my ($name)      = $disposition =~ / name="?([^\";]+)"?/;
+        my ($filename)  = $disposition =~ / filename="?([^\"]*)"?/;
+        # Need to match empty filenames above, so this part is flagged as an upload type
 
-        $part->{name}     = $name;
-        $part->{filename} = $filename;
+        $part->{name} = $name;
 
-        if ($filename) {
+        if ( defined $filename ) {
+            $part->{filename} = $filename;
 
-            my $fh = File::Temp->new( UNLINK => 0 );
+            if ( $filename ne "" ) {
+                my $fh = File::Temp->new( UNLINK => 0, DIR => $self->tmpdir );
 
-            $part->{fh}       = $fh;
-            $part->{tempname} = $fh->filename;
+                $part->{fh}       = $fh;
+                $part->{tempname} = $fh->filename;
+            }
         }
     }
 
-    if ( $part->{filename} && ( my $length = length( $part->{data} ) ) ) {
+    if ( $part->{fh} && ( my $length = length( $part->{data} ) ) ) {
         $part->{fh}->write( substr( $part->{data}, 0, $length, '' ), $length );
     }
 
     if ( $part->{done} ) {
 
-        if ( $part->{filename} ) {
+        if ( exists $part->{filename} ) {
+            if ( $part->{filename} ne "" ) {
+                $part->{fh}->close if defined $part->{fh};
 
-            $part->{fh}->close;
+                delete @{$part}{qw[ data done fh ]};
 
-            delete @{$part}{qw[ data done fh ]};
-
-            $self->upload( $part->{name}, $part );
+                $self->upload( $part->{name}, $part );
+            }
         }
-
         else {
             $self->param( $part->{name}, $part->{data} );
         }