[http-server] Remove <basic-request>.

This consolidates things into <request>.