merged changes between Nginx-1.2.5 and Nginx-1.2.7