Adding Apache 2.2 support