Build custom multipart body

mynetx · mynetx · commit aa59f91db553 · 2013-06-15T15:44:57.000+02:00
diff --git a/src/codebird.php b/src/codebird.php
@@ -758,9 +758,11 @@ protected function _buildMultipart($method, $params)
                     }
                 }
 
+                /*
                 $multipart_request .=
                     "\r\nContent-Transfer-Encoding: base64";
                 $value = base64_encode($value);
+                */
             }
 
             $multipart_request .=
@@ -846,17 +848,15 @@ protected function _callApi($httpmethod, $method, $method_template, $params = ar
         }
         if ($multipart) {
             $first_newline      = strpos($params, "\r\n");
-            $multipart_boundary = substr($params, 2, $first_newline);
+            $multipart_boundary = substr($params, 2, $first_newline - 2);
+            $request_headers[]  = 'Content-Length: ' . strlen($params);
             $request_headers[]  = 'Content-Type: multipart/form-data; boundary='
                 . $multipart_boundary;
         }
 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
         curl_setopt($ch, CURLOPT_HEADER, 1);
-        // curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-        // curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        // curl_setopt($ch, CURLOPT_PROXY, '127.0.0.1:8888');
         curl_setopt($ch, CURLOPT_HTTPHEADER, $request_headers);
 
         $reply      = curl_exec($ch);

Original file line number	Diff line number	Diff line change
`@@ -758,9 +758,11 @@ protected function _buildMultipart($method, $params)`
`758`	`758`	`}`
`759`	`759`	`}`
`760`	`760`
	`761`	`+ /*`
`761`	`762`	`$multipart_request .=`
`762`	`763`	`"\r\nContent-Transfer-Encoding: base64";`
`763`	`764`	`$value = base64_encode($value);`
	`765`	`+ */`
`764`	`766`	`}`
`765`	`767`
`766`	`768`	`$multipart_request .=`
`@@ -846,17 +848,15 @@ protected function _callApi($httpmethod, $method, $method_template, $params = ar`
`846`	`848`	`}`
`847`	`849`	`if ($multipart) {`
`848`	`850`	`$first_newline = strpos($params, "\r\n");`
`849`		`- $multipart_boundary = substr($params, 2, $first_newline);`
	`851`	`+ $multipart_boundary = substr($params, 2, $first_newline - 2);`
	`852`	`+ $request_headers[] = 'Content-Length: ' . strlen($params);`
`850`	`853`	`$request_headers[] = 'Content-Type: multipart/form-data; boundary='`
`851`	`854`	`. $multipart_boundary;`
`852`	`855`	`}`
`853`	`856`
`854`	`857`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);`
`855`	`858`	`curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);`
`856`	`859`	`5970 curl_setopt($ch, CURLOPT_HEADER, 1);`
`857`		`- // curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);`
`858`		`- // curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);`
`859`		`- // curl_setopt($ch, CURLOPT_PROXY, '127.0.0.1:8888');`
`860`	`860`	`curl_setopt($ch, CURLOPT_HTTPHEADER, $request_headers);`
`861`	`861`
`862`	`862`	`$reply = curl_exec($ch);`