Merge pull request #6524 from zhaojh329/libuhttpd