merge changes between nginx 1.2.6 and nginx 1.2.7