applied the official patch for the nginx security vulnerability CVE-2013-2070.
Merge branch 'tmp'