Changeset 189

Timestamp:

03/22/2007 23:55:43 (20 months ago)

Author:

why

Message:

• lib/camping.rb: fixing uploads with ticket #107, at long last, thankyou brmichel!
  

Location:

trunk/lib

Files:

• camping-unabridged.rb (modified) (1 diff)
• camping.rb (modified) (1 diff)

trunk/lib/camping-unabridged.rb

@@ -411 +411 @@
             fh=""
           end
-          while l=@in.read(16384)
-            if l=~b
+          s=8192 
+          k='' 
+          l=@in.read(s*2) 
+          while l 
+            if (k<<l)=~b 
               o<<$`.chomp
               @in.seek(-$'.size,IO::SEEK_CUR)
               break
             end
-            o<<l
+            o<<k.slice!(0...s) 
+            l=@in.read(s) 
           end
           C.qsp(fn,'&;',fh,qs) if fn

trunk/lib/camping.rb

@@ -19 +19 @@
 when/^Content-D.+?: form-data;/;fh.u H[*$'.scan(/(?:\s(\w+)="([^"]+)")/).flatten]
 when/^Content-Type: (.+?)(\r$|\Z)/m;fh[:type]=$1;end;end;fn=fh[:name];o=if
-fh[:filename];o=fh[:tempfile]=Tempfile.new(:C);o.binmode;else;fh=""end;while l=@in.
-read(16384);if l=~b;o<<$`.chomp;@in.seek(-$'.size,IO::SEEK_CUR);break;end;o<<l
+fh[:filename];o=fh[:tempfile]=Tempfile.new(:C);o.binmode;else;fh=""end;s=8192;k=
+'';l=@in.read(s*2);while l;if(k<<l)=~b;o<<$`.chomp;@in.seek(-$'.size,
+IO::SEEK_CUR);break;end;o<<k.slice!(0...s);l=@in.read(s)
 end;C.qsp(fn,'&;',fh,q) if fn;fh[:tempfile].rewind if fh.is_a?H;end;elsif@method==
 "post" and e.CONTENT_TYPE == "application/x-www-form-urlencoded"