merge changes between nginx 1.2.9 and 1.4.3

merge changes between nginx 1.2.9 and 1.4.3
merge nginx tests