Final patch for 2.4.10

As submitted as PR with FreeBSD and Apache httpd
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196139
https://issues.apache.org/bugzilla/show_bug.cgi?id=57375