[PATCH] httpd content, minor fixups