Fixing bugs after changing http-server API
Autocommit Tue Aug 05 11:45:25 EST 2014