Merge branch 'master' into http2-push

lib/multi.c

@@ -400,7 +400,10 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle,
   /* Point to the multi's connection cache */
   data->state.conn_cache = &multi->conn_cache;
 
-  data->state.infilesize = data->set.filesize;
+  if(data->set.httpreq == HTTPREQ_PUT)
+    data->state.infilesize = data->set.filesize;
+  else
+    data->state.infilesize = data->set.postfieldsize;
 
   /* This adds the new entry at the 'end' of the doubly-linked circular
      list of SessionHandle structs to try and maintain a FIFO queue so
@@ -1529,9 +1532,6 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
         break;
       }
 
-      DEBUGF(infof(data, "multi_runsingle:%d call Curl_readwrite\n",
-                   __LINE__));
-
       /* read/write data if it is ready to do so */
       result = Curl_readwrite(data->easy_conn, data, &done);