Upstream: reduced diffs to the plus version of nginx.

No functional changes.

--HG--
extra : rebase_source : 72cb79983c1e8c7ee599a3802f02c49a941c10ab