Skip to content

Multipart multiplying memory allocation #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Multipart multiplying memory allocation #49

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97a5c76
removed multiplying memory allocation
pigi72333 Jan 11, 2016
2e50a88
Miss ltrim
pigi72333 Jan 11, 2016
69de367
Fix "new line" symbol
pigi72333 Jan 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions src/MultipartParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,34 +136,41 @@ protected function octetStream($string)
*/
protected function file($string)
{
preg_match('/name=\"([^\"]*)\"; filename=\"([^\"]*)\"[\n|\r]+([^\n\r].*)?\r$/s', $string, $match);
preg_match('/Content-Type: (.*)?/', $match[3], $mime);

$content = preg_replace('/Content-Type: (.*)[^\n\r]/', '', $match[3]);
$content = ltrim($content, "\r\n");

$match = array();
preg_match('/name=\"(?P<name>[^\"]*)\";/', $string, $match);
$name = $match['name'];

$match = array();
preg_match('/filename=\"(?P<filename>[^\"]*)\"[\n|\r]/', $string, $match);
$filename = $match['filename'];

$match = array();
preg_match('/Content-Type: (?P<mime>.*)?/', $string, $match);
$mime = $match['mime'];
//Do not use preg_match function to parse entire request body because of multiplying (twice) allocated memory for content data
$pos = strpos($string, "\r\n\r\n");
$string = substr_replace($string, '', 0, $pos);
$string = trim($string, "\r\n");
// Put content in a stream
$stream = fopen('php://memory', 'r+');
if ($content !== '') {
fwrite($stream, $content);
$stream = fopen('php://temp', 'r+');
if ($string !== '') {
fwrite($stream, $string);
fseek($stream, 0);
}

$data = [
'name' => $match[2],
'type' => trim($mime[1]),
'name' => $filename,
'type' => trim($mime),
'stream' => $stream, // Instead of writing to a file, we write to a stream.
'error' => UPLOAD_ERR_OK,
'size' => function_exists('mb_strlen')? mb_strlen($content, '8bit') : strlen($content),
'size' => function_exists('mb_strlen')? mb_strlen($string, '8bit') : strlen($string),
];

//TODO :: have an option to write to files to emulate the same functionality as a real php server
//$path = tempnam(sys_get_temp_dir(), "php");
//$err = file_put_contents($path, $content);
//$data['tmp_name'] = $path;
//$data['error'] = ($err === false) ? UPLOAD_ERR_NO_FILE : UPLOAD_ERR_OK;

$this->addResolved('files', $match[1], $data);
$this->addResolved('files', $name, $data);
}

/**
Expand Down Expand Up @@ -201,3 +208,4 @@ protected function addResolved($type, $key, $content)
}
}
}