Merge remote-tracking branch 'upstream/master'

client/client.go

@@ -228,6 +228,8 @@ func (client *Client) do(funcname string, data []byte,
 	client.Lock()
 	defer client.Unlock()
 	var result = make(chan handleOrError, 1)
+	client.Lock()
+	defer client.Unlock()
 	client.lastcall = "c"
 	client.innerHandler.put("c", func(resp *Response) {
 		if resp.DataType == dtError {

client/common.go

@@ -51,6 +51,7 @@ const (
 	dtSubmitJobLowBg  = 34
 
 	WorkComplate  = dtWorkComplete
+	WorkComplete  = dtWorkComplete
 	WorkData      = dtWorkData
 	WorkStatus    = dtWorkStatus
 	WorkWarning   = dtWorkWarning