uhttpd: merge r30806