Port scott's changes from apache-1.3 to apache-2.