From 41fb6443ceeda65c09dbe0e1fd7591269e4966a9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 23 Jul 2013 22:10:44 +0200 Subject: formadd: CURLFORM_FILECONTENT wrongly rejected some option combos The code for CURLFORM_FILECONTENT had its check for duplicate options wrong so that it would reject CURLFORM_PTRNAME if used in combination with it (but not CURLFORM_COPYNAME)! The flags field used for this purpose cannot be interpreted that broadly. Bug: http://curl.haxx.se/mail/lib-2013-07/0258.html Reported-by: Byrial Jensen --- lib/formdata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/formdata.c b/lib/formdata.c index decb84d9f..1984a9712 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -426,7 +426,7 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost, /* Get contents from a given file name */ case CURLFORM_FILECONTENT: - if(current_form->flags != 0) + if(current_form->flags & (HTTPPOST_PTRCONTENTS|HTTPPOST_READFILE)) return_value = CURL_FORMADD_OPTION_TWICE; else { const char *filename = array_state? -- cgit v1.2.3