Skip to content
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.

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

Jump to bottom

Boundary begins with CRLF? #272

Merged
merged 7 commits into from Jul 25, 2012
Merged

Boundary begins with CRLF? #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fcab7f1
Adding a line break to the preamble as the first part of a multipart …
elspoono Jun 15, 2012
7ff5dae
Merge remote-tracking branch 'upstream/master'
Jun 28, 2012
3daebaf
Merge branch 'master' of https://github.com/mikeal/request
Jul 6, 2012
dba2ebf
Updating with corresponding tests.
Jul 6, 2012
396531d
Removing console.log of multipart
Jul 6, 2012
54226a3
Okay, trying it as an optional parameter, with a new test in test-bod…
Jul 6, 2012
0a8a5ab
Merge remote-tracking branch 'upstream/master'
Jul 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions main.js
View file
Open in desktop
Expand Up @@ -659,10 +659,12 @@ Request.prototype.multipart = function (multipart) {
self.headers['content-type'] = self.headers['content-type'].split(';')[0] + '; boundary=' + self.boundary;
}

console.log('boundary >> ' + self.boundary)

if (!multipart.forEach) throw new Error('Argument error, options.multipart.')

if (self.preambleCRLF) {
self.body.push(new Buffer('\r\n'))
}

multipart.forEach(function (part) {
var body = part.body
if(body == null) throw Error('Body attribute missing in multipart.')
Expand Down
17 changes: 17 additions & 0 deletions tests/test-body.js
View file
Open in desktop
Expand Up @@ -66,6 +66,23 @@ var tests =
, {'body': 'Oh hi.'}
]
}
, testPutMultipartPreambleCRLF :
{ resp: server.createPostValidator(
'\r\n--__BOUNDARY__\r\n' +
'content-type: text/html\r\n' +
'\r\n' +
'<html><body>Oh hi.</body></html>' +
'\r\n--__BOUNDARY__\r\n\r\n' +
'Oh hi.' +
'\r\n--__BOUNDARY__--'
)
, method: "PUT"
, preambleCRLF: true
, multipart:
[ {'content-type': 'text/html', 'body': '<html><body>Oh hi.</body></html>'}
, {'body': 'Oh hi.'}
]
}
}

s.listen(s.port, function () {
Expand Down