Allow either multipart-post 1.x or 2.0