more changes for apache 2.4