Merge pull request #484 from janusman/301-malformed-multipart-form-upload

Basing off pull request 413, fixing tests

library/Solarium/Core/Client/Adapter/Http.php

@@ -111,13 +111,25 @@ class Http extends Configurable implements AdapterInterface
 
         if ($method == Request::METHOD_POST) {
             if ($request->getFileUpload()) {
+                $boundary = '----------' . md5(time());
+                $CRLF = "\r\n";
+                $file = $request->getFileUpload();
+                $filename = basename($file);
+                // Add the proper boundary to the Content-Type header
+                $request->addHeader("Content-Type: multipart/form-data; boundary={$boundary}");
+                $data =  "--{$boundary}" . $CRLF;
+                $data .= 'Content-Disposition: form-data; name="upload"; filename=' . $filename . $CRLF;
+                $data .= 'Content-Type: application/octet-stream' . $CRLF . $CRLF;
+                $data .= file_get_contents($request->getFileUpload()) . $CRLF;
+                $data .= '--' . $boundary . '--';
+                $content_length = strlen($data);
+                $request->addHeader("Content-Length: $content_length\r\n");
                 stream_context_set_option(
                     $context,
                     'http',
                     'content',
-                    file_get_contents($request->getFileUpload())
+                    $data
                 );
-                $request->addHeader('Content-Type: multipart/form-data');
             } else {
                 $data = $request->getRawData();
                 if (null !== $data) {

library/Solarium/QueryType/Extract/RequestBuilder.php

@@ -107,7 +107,6 @@ class RequestBuilder extends BaseRequestBuilder
         } elseif (is_readable($file)) {
             $request->setFileUpload($file);
             $request->addParam('resource.name', basename($query->getFile()));
-            $request->addHeader('Content-Type: multipart/form-data');
         } else {
             throw new RuntimeException('Extract query file path/url invalid or not available');
         }

tests/Solarium/Tests/Core/Client/Adapter/HttpTest.php

@@ -184,16 +184,20 @@ class HttpTest extends \PHPUnit_Framework_TestCase
 
         $context = $this->adapter->createContext($request, $endpoint);
 
+        // Remove content from comparison, since we can't determine the
+        // random boundary string.
+        $stream_context_get_options = stream_context_get_options($context);
+        unset($stream_context_get_options['http']['content']);
+        unset($stream_context_get_options['http']['header']);
+
         $this->assertEquals(
             array(
                 'http' => array(
                     'method' => $method,
                     'timeout' => $timeout,
-                    'content' => file_get_contents(__FILE__),
-                    'header' => 'Content-Type: multipart/form-data',
                 )
             ),
-            stream_context_get_options($context)
+            $stream_context_get_options
         );
     }
 

tests/Solarium/Tests/QueryType/Extract/RequestBuilderTest.php

@@ -134,9 +134,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
 
     public function testContentTypeHeader()
     {
-        $headers = array(
-            'Content-Type: multipart/form-data'
-        );
+        $headers = array();
         $request = $this->builder->build($this->query);
         $this->assertEquals($headers,
                             $request->getHeaders());