First pass at new patch file for mod-ssl-with-npn