Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for bug 133453 - adds filename and Content-Type: for

Browse Source 
backwards compatibility
r= alexsavulov
sr = attinasi
a = asa
adt1.0.0+ = JRjr

-----------------------------157241916926500
Content-Disposition: form-data; name="file2"; filename=""
Content-Type: application/octet-stream


git-svn-id: svn://10.0.0.236/trunk@118410 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alexsavulov%netscape.com
2002-04-07 00:17:56 +00:00
parent a30b39396c
commit 7a5fcaeca0
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/content/html/content/src/nsFormSubmission.cpp
View File

@@ -533,7 +533,9 @@ nsFSMultipartFormData::AddNameFilePair(nsIDOMHTMLElement* aSource,
//
// Add the file to the stream
//
mPostDataStream->AppendStream(aStream);
if (aStream) {
mPostDataStream->AppendStream(aStream);
}
//
// CRLF after file

30
mozilla/content/html/content/src/nsHTMLInputElement.cpp
View File

@@ -2166,7 +2166,6 @@ nsHTMLInputElement::SubmitNamesValues(nsIFormSubmission* aFormSubmission,
//
// Submit file if it's input type=file and this encoding method accepts files
//
PRBool submittedValue = PR_FALSE;
if (type == NS_FORM_INPUT_FILE) {
//
@@ -2228,27 +2227,34 @@ nsHTMLInputElement::SubmitNamesValues(nsIFormSubmission* aFormSubmission,
aFormSubmission->AddNameFilePair(this, name, filename,
bufferedStream, contentType,
PR_FALSE);
submittedValue = PR_TRUE;
return rv;
}
}
//
// If we don't submit as a file, at least submit the truncated filename.
//
if (!submittedValue) {
aFormSubmission->AddNameValuePair(this, name, filename);
submittedValue = PR_TRUE;
}
aFormSubmission->AddNameFilePair(this, name, filename,
nsnull, NS_LITERAL_CSTRING("application/octet-stream"),
PR_FALSE);
return rv;
}
}
//
// If we can't even make a truncated filename, submit empty string
// rather than sending everything
//
aFormSubmission->AddNameFilePair(this, name, value,
nsnull, NS_LITERAL_CSTRING("application/octet-stream"),
PR_FALSE);
return rv;
}
if (!submittedValue) {
// Submit
// (for type=image, only submit if value is non-null)
if (type != NS_FORM_INPUT_IMAGE || !value.IsEmpty()) {
rv = aFormSubmission->AddNameValuePair(this, name, value);
}
// Submit
// (for type=image, only submit if value is non-null)
if (type != NS_FORM_INPUT_IMAGE || !value.IsEmpty()) {
rv = aFormSubmission->AddNameValuePair(this, name, value);
}
return rv;