svn commit: r1158820 - /trafficserver/traffic/trunk/proxy/hdrs/MIME.cc

[am...@apache.org]

Author: amc
Date: Wed Aug 17 16:43:56 2011
New Revision: 1158820

URL: http://svn.apache.org/viewvc?rev=1158820&view=rev
Log:
Further fix for TS-466.

Modified:
    trafficserver/traffic/trunk/proxy/hdrs/MIME.cc

Modified: trafficserver/traffic/trunk/proxy/hdrs/MIME.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/MIME.cc?rev=1158820&r1=1158819&r2=1158820&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/MIME.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/MIME.cc Wed Aug 17 16:43:56 2011
@@ -2436,12 +2436,6 @@ mime_scanner_get(MIMEScanner * S,
 
   ptrdiff_t data_size = raw_input_c - *raw_input_s;
 
-  if (data_size && S->m_line_length) {
-    // If we're already accumulating, continue to do so if we have data.
-    mime_scanner_append(S, *raw_input_s, data_size);
-    data_size = 0;
-  }
-
   if (PARSE_CONT == zret) {
     // data ran out before we got a clear final result.
     // There a number of things we need to check and possibly adjust
@@ -2471,9 +2465,15 @@ mime_scanner_get(MIMEScanner * S,
     } else if (data_size) {
       // Inside a field but more data is expected. Save what we've got.
       mime_scanner_append(S, *raw_input_s, data_size);
+      data_size = 0; // Don't append again.
     }
   } 
 
+  if (data_size && S->m_line_length) {
+    // If we're already accumulating, continue to do so if we have data.
+    mime_scanner_append(S, *raw_input_s, data_size);
+  }
+
   // adjust out arguments.
   if (PARSE_CONT != zret) {
     if (0 != S->m_line_length) {