Merge branch 'mswain-changes' into veracross+mswain

Attempting to merge the changes for 1.4 from repo
@ github.com:/mswain/nginx-upload-module.git

With the changes from the Veracross repo:
@ github.com:/veracross/nginx-upload-module.git

It compiles, but that's all I can say at this point.
It will need some heavy regression testing before
it can be used. I really don't know Nginx's internals
so it's kind of a blind merge.

Conflicts:
	ngx_http_upload_module.c

Author: cmdrclueless