Proposal to fix issue #2004

Proposal to fix issue #2004 by testing if "boundary" as (before or after) a charset property set for all the request.