Initial commit.
Merge https://github.com/rosarinjroy/httpd22to24