Some updates/modifications (based on the patch from the PR).

PR: 3549
Submitted by: Joshua Slive <slive+apachebugs@finance.commerce.ubc.ca>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82506 13f79535-47bb-0310-9956-ffa450edef68