merged changes between nginx 1.4.7 and 1.6.1 except spdy
updated testcases