merge changes between nginx 1.2.6 and nginx 1.2.7
Merge pull request #188 from cfsego/calibaba

merge changes between nginx 1.2.6 and nginx 1.2.7