Allow charset in multipart Content-Type

Closes #3

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: webutils
 Type: Package
 Title: Utility Functions for Developing Web Applications
-Version: 1.0
+Version: 1.1
 Author: Jeroen Ooms
 Maintainer: Jeroen Ooms <[email protected]>
 Description: Parses http request data in application/json, multipart/form-data, 
@@ -16,5 +16,5 @@ Imports:
 Suggests:
     httpuv,
     testthat
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.2
 Language: en-US

NEWS

@@ -1,3 +1,6 @@
+1.1
+  - Allow charset in multipart Content-Type (#3)
+
 1.0
   - Ignore additional fields such as charset from the multipart boundary
   - Fix a unit test to avoid a bug in libcurl: https://github.com/curl/curl/issues/4246

R/get_boundary.R

@@ -1,7 +1,9 @@
 get_boundary <- function(content_type){
-  # Check for multipart
-  if(!grepl("multipart/form-data; boundary=", content_type, fixed = TRUE))
+  # Check for multipart header
+  if(!grepl("multipart/form-data;", content_type, fixed = TRUE))
     stop("Content type is not multipart/form-data: ", content_type)
+  if(!grepl("boundary=", content_type, fixed = TRUE))
+    stop("Multipart content-type header without boundary: ", content_type)
 
   # Extract bounary
   m <- regexpr('boundary=[^; ]{2,}', content_type, ignore.case = TRUE)

R/parse_http.R

@@ -25,7 +25,7 @@ parse_http <- function(body, content_type, ...){
   content_type <- sub("Content-Type: ?", "", content_type, ignore.case=TRUE);
 
   # Switch by content-type
-  if(grepl("multipart/form-data; boundary=", content_type, fixed=TRUE)){
+  if(grepl("multipart/form-data;", content_type, fixed = TRUE)){
     return(parse_multipart(body, get_boundary(content_type)))
   } else if(grepl("application/x-www-form-urlencoded", content_type, fixed=TRUE)){
     return(parse_query(body))