Do not return early if both content-type and content-length is specified.

Calling putFile with both content-type and content-length headers would result in the upload never starting, and the callback never called.

I believe this was a bug introduced in 15e22278cc31.