httpd trunk r1587607 now has the necessary patches