merged changes between nginx 1.4.7 and 1.6.1 except spdy
updated testcases
Merge pull request #517 from cfsego/merge-nginx-1.6.1

merged changes between nginx 1.6.1 and 1.4.7