Merge pull request #14281 from zhaojh329/libuhttpd