A couple of patches from Nginx connaisseur Maxim Dounin - View it on GitHub