http-client completed
fixed merge http-client
completed http-client