Loading lib/transfer.c +24 −23 Original line number Diff line number Diff line Loading @@ -194,7 +194,8 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) /* \n will become \r\n later on */ endofline_native = "\n"; endofline_network = "\x0a"; } else { } else { endofline_native = "\r\n"; endofline_network = "\x0d\x0a"; } Loading @@ -219,21 +220,20 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) if(data->set.prefer_ascii) { /* translate the protocol and data */ length = nread; } else { } else { /* just translate the protocol portion */ length = strlen(hexbuffer); } res = Curl_convert_to_network(data, data->req.upload_fromhere, length); /* Curl_convert_to_network calls failf if unsuccessful */ if(res != CURLE_OK) { if(res) return(res); } #endif /* CURL_DOES_CONVERSIONS */ if((nread - hexlen) == 0) { if((nread - hexlen) == 0) /* mark this as done once this chunk is transfered */ data->req.upload_done = TRUE; } nread+=(int)strlen(endofline_native); /* for the added end of line */ } Loading Loading @@ -1063,7 +1063,8 @@ CURLcode Curl_readwrite(struct connectdata *conn, failf(data, "Operation timed out after %ld milliseconds with %" FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received", Curl_tvdiff(k->now, k->start), k->bytecount, k->size); } else { } else { failf(data, "Operation timed out after %ld milliseconds with %" FORMAT_OFF_T " bytes received", Curl_tvdiff(k->now, k->start), k->bytecount); Loading Loading
lib/transfer.c +24 −23 Original line number Diff line number Diff line Loading @@ -194,7 +194,8 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) /* \n will become \r\n later on */ endofline_native = "\n"; endofline_network = "\x0a"; } else { } else { endofline_native = "\r\n"; endofline_network = "\x0d\x0a"; } Loading @@ -219,21 +220,20 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) if(data->set.prefer_ascii) { /* translate the protocol and data */ length = nread; } else { } else { /* just translate the protocol portion */ length = strlen(hexbuffer); } res = Curl_convert_to_network(data, data->req.upload_fromhere, length); /* Curl_convert_to_network calls failf if unsuccessful */ if(res != CURLE_OK) { if(res) return(res); } #endif /* CURL_DOES_CONVERSIONS */ if((nread - hexlen) == 0) { if((nread - hexlen) == 0) /* mark this as done once this chunk is transfered */ data->req.upload_done = TRUE; } nread+=(int)strlen(endofline_native); /* for the added end of line */ } Loading Loading @@ -1063,7 +1063,8 @@ CURLcode Curl_readwrite(struct connectdata *conn, failf(data, "Operation timed out after %ld milliseconds with %" FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received", Curl_tvdiff(k->now, k->start), k->bytecount, k->size); } else { } else { failf(data, "Operation timed out after %ld milliseconds with %" FORMAT_OFF_T " bytes received", Curl_tvdiff(k->now, k->start), k->bytecount); Loading