Copule more changes for cgi support
Merge branch 'nginx-cgi-support' into solo_and_cgi