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