Unity-Technologies
/
curl
зеркало из https://github.com/Unity-Technologies/curl.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

lib: unify the upload/method handling 

By making sure we set state.upload based on the set.method value and not
independently as set.upload, we reduce confusion and mixup risks, both
internally and externally.

Closes #11017
This commit is contained in:
Daniel Stenberg 2023-04-25 08:28:01 +02:00
Родитель e5af5b7905
Коммит 7815647d65
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 5CC908FDB71E12C2
15 изменённых файлов: 36 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
lib/curl_rtmp.c
Просмотреть файл

@ -231,7 +231,7 @@ static CURLcode rtmp_connect(struct Curl_easy *data, bool *done)
/* We have to know if it's a write before we send the /* We have to know if it's a write before we send the
* connect request packet * connect request packet
*/ */
if(data->set.upload) if(data->state.upload)
r->Link.protocol |= RTMP_FEATURE_WRITE; r->Link.protocol |= RTMP_FEATURE_WRITE;
/* For plain streams, use the buffer toggle trick to keep data flowing */ /* For plain streams, use the buffer toggle trick to keep data flowing */
@ -263,7 +263,7 @@ static CURLcode rtmp_do(struct Curl_easy *data, bool *done)
if(!RTMP_ConnectStream(r, 0)) if(!RTMP_ConnectStream(r, 0))
return CURLE_FAILED_INIT; return CURLE_FAILED_INIT;
if(data->set.upload) { if(data->state.upload) {
Curl_pgrsSetUploadSize(data, data->state.infilesize); Curl_pgrsSetUploadSize(data, data->state.infilesize);
Curl_setup_transfer(data, -1, -1, FALSE, FIRSTSOCKET); Curl_setup_transfer(data, -1, -1, FALSE, FIRSTSOCKET);
} }

4
lib/file.c
Просмотреть файл

@ -240,7 +240,7 @@ static CURLcode file_connect(struct Curl_easy *data, bool *done)
file->freepath = real_path; /* free this when done */ file->freepath = real_path; /* free this when done */
file->fd = fd; file->fd = fd;
if(!data->set.upload && (fd == -1)) { if(!data->state.upload && (fd == -1)) {
failf(data, "Couldn't open file %s", data->state.up.path); failf(data, "Couldn't open file %s", data->state.up.path);
file_done(data, CURLE_FILE_COULDNT_READ_FILE, FALSE); file_done(data, CURLE_FILE_COULDNT_READ_FILE, FALSE);
return CURLE_FILE_COULDNT_READ_FILE; return CURLE_FILE_COULDNT_READ_FILE;
@ -422,7 +422,7 @@ static CURLcode file_do(struct Curl_easy *data, bool *done)
Curl_pgrsStartNow(data); Curl_pgrsStartNow(data);
if(data->set.upload) if(data->state.upload)
return file_upload(data); return file_upload(data);
file = data->req.p.file; file = data->req.p.file;

8
lib/ftp.c
Просмотреть файл

@ -1348,7 +1348,7 @@ static CURLcode ftp_state_prepare_transfer(struct Curl_easy *data)
data->set.str[STRING_CUSTOMREQUEST]? data->set.str[STRING_CUSTOMREQUEST]?
data->set.str[STRING_CUSTOMREQUEST]: data->set.str[STRING_CUSTOMREQUEST]:
(data->state.list_only?"NLST":"LIST")); (data->state.list_only?"NLST":"LIST"));
else if(data->set.upload) else if(data->state.upload)
result = Curl_pp_sendf(data, &ftpc->pp, "PRET STOR %s", result = Curl_pp_sendf(data, &ftpc->pp, "PRET STOR %s",
conn->proto.ftpc.file); conn->proto.ftpc.file);
else else
@ -3384,7 +3384,7 @@ static CURLcode ftp_done(struct Curl_easy *data, CURLcode status,
/* the response code from the transfer showed an error already so no /* the response code from the transfer showed an error already so no
use checking further */ use checking further */
; ;
else if(data->set.upload) { else if(data->state.upload) {
if((-1 != data->state.infilesize) && if((-1 != data->state.infilesize) &&
(data->state.infilesize != data->req.writebytecount) && (data->state.infilesize != data->req.writebytecount) &&
!data->set.crlf && !data->set.crlf &&
@ -3640,7 +3640,7 @@ static CURLcode ftp_do_more(struct Curl_easy *data, int *completep)
connected back to us */ connected back to us */
} }
} }
else if(data->set.upload) { else if(data->state.upload) {
result = ftp_nb_type(data, conn, data->state.prefer_ascii, result = ftp_nb_type(data, conn, data->state.prefer_ascii,
FTP_STOR_TYPE); FTP_STOR_TYPE);
if(result) if(result)
@ -4225,7 +4225,7 @@ CURLcode ftp_parse_url_path(struct Curl_easy *data)
ftpc->file = NULL; /* instead of point to a zero byte, ftpc->file = NULL; /* instead of point to a zero byte,
we make it a NULL pointer */ we make it a NULL pointer */
if(data->set.upload && !ftpc->file && (ftp->transfer == PPTRANSFER_BODY)) { if(data->state.upload && !ftpc->file && (ftp->transfer == PPTRANSFER_BODY)) {
/* We need a file name when uploading. Return error! */ /* We need a file name when uploading. Return error! */
failf(data, "Uploading to a URL without a file name"); failf(data, "Uploading to a URL without a file name");
free(rawPath); free(rawPath);

4
lib/http.c
Просмотреть файл

@ -2112,7 +2112,7 @@ void Curl_http_method(struct Curl_easy *data, struct connectdata *conn,
Curl_HttpReq httpreq = (Curl_HttpReq)data->state.httpreq; Curl_HttpReq httpreq = (Curl_HttpReq)data->state.httpreq;
const char *request; const char *request;
if((conn->handler->protocol&(PROTO_FAMILY_HTTP|CURLPROTO_FTP)) && if((conn->handler->protocol&(PROTO_FAMILY_HTTP|CURLPROTO_FTP)) &&
data->set.upload) data->state.upload)
httpreq = HTTPREQ_PUT; httpreq = HTTPREQ_PUT;
/* Now set the 'request' pointer to the proper request string */ /* Now set the 'request' pointer to the proper request string */
@ -2423,7 +2423,7 @@ CURLcode Curl_http_body(struct Curl_easy *data, struct connectdata *conn,
if((conn->handler->protocol & PROTO_FAMILY_HTTP) && if((conn->handler->protocol & PROTO_FAMILY_HTTP) &&
(((httpreq == HTTPREQ_POST_MIME || httpreq == HTTPREQ_POST_FORM) && (((httpreq == HTTPREQ_POST_MIME || httpreq == HTTPREQ_POST_FORM) &&
http->postsize < 0) || http->postsize < 0) ||
((data->set.upload || httpreq == HTTPREQ_POST) && ((data->state.upload || httpreq == HTTPREQ_POST) &&
data->state.infilesize == -1))) { data->state.infilesize == -1))) {
if(conn->bits.authneg) if(conn->bits.authneg)
/* don't enable chunked during auth neg */ /* don't enable chunked during auth neg */

6
lib/imap.c
Просмотреть файл

@ -1511,11 +1511,11 @@ static CURLcode imap_done(struct Curl_easy *data, CURLcode status,
result = status; /* use the already set error code */ result = status; /* use the already set error code */
} }
else if(!data->set.connect_only && !imap->custom && else if(!data->set.connect_only && !imap->custom &&
(imap->uid || imap->mindex || data->set.upload || (imap->uid || imap->mindex || data->state.upload ||
data->set.mimepost.kind != MIMEKIND_NONE)) { data->set.mimepost.kind != MIMEKIND_NONE)) {
/* Handle responses after FETCH or APPEND transfer has finished */ /* Handle responses after FETCH or APPEND transfer has finished */
if(!data->set.upload && data->set.mimepost.kind == MIMEKIND_NONE) if(!data->state.upload && data->set.mimepost.kind == MIMEKIND_NONE)
state(data, IMAP_FETCH_FINAL); state(data, IMAP_FETCH_FINAL);
else { else {
/* End the APPEND command first by sending an empty line */ /* End the APPEND command first by sending an empty line */
@ -1581,7 +1581,7 @@ static CURLcode imap_perform(struct Curl_easy *data, bool *connected,
selected = TRUE; selected = TRUE;
/* Start the first command in the DO phase */ /* Start the first command in the DO phase */
if(data->set.upload || data->set.mimepost.kind != MIMEKIND_NONE) if(data->state.upload || data->set.mimepost.kind != MIMEKIND_NONE)
/* APPEND can be executed directly */ /* APPEND can be executed directly */
result = imap_perform_append(data); result = imap_perform_append(data);
else if(imap->custom && (selected || !imap->mailbox)) else if(imap->custom && (selected || !imap->mailbox))

4
lib/rtsp.c
Просмотреть файл

@ -493,7 +493,7 @@ static CURLcode rtsp_do(struct Curl_easy *data, bool *done)
rtspreq == RTSPREQ_SET_PARAMETER || rtspreq == RTSPREQ_SET_PARAMETER ||
rtspreq == RTSPREQ_GET_PARAMETER) { rtspreq == RTSPREQ_GET_PARAMETER) {
if(data->set.upload) { if(data->state.upload) {
putsize = data->state.infilesize; putsize = data->state.infilesize;
data->state.httpreq = HTTPREQ_PUT; data->state.httpreq = HTTPREQ_PUT;
@ -512,7 +512,7 @@ static CURLcode rtsp_do(struct Curl_easy *data, bool *done)
result = result =
Curl_dyn_addf(&req_buffer, Curl_dyn_addf(&req_buffer,
"Content-Length: %" CURL_FORMAT_CURL_OFF_T"\r\n", "Content-Length: %" CURL_FORMAT_CURL_OFF_T"\r\n",
(data->set.upload ? putsize : postsize)); (data->state.upload ? putsize : postsize));
if(result) if(result)
return result; return result;
} }

6
lib/setopt.c
Просмотреть файл

@ -333,8 +333,8 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
* We want to sent data to the remote host. If this is HTTP, that equals * We want to sent data to the remote host. If this is HTTP, that equals
* using the PUT request. * using the PUT request.
*/ */
data->set.upload = (0 != va_arg(param, long)) ? TRUE : FALSE; arg = va_arg(param, long);
if(data->set.upload) { if(arg) {
/* If this is HTTP, PUT is what's needed to "upload" */ /* If this is HTTP, PUT is what's needed to "upload" */
data->set.method = HTTPREQ_PUT; data->set.method = HTTPREQ_PUT;
data->set.opt_no_body = FALSE; /* this is implied */ data->set.opt_no_body = FALSE; /* this is implied */
@ -664,7 +664,6 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
} }
else else
data->set.method = HTTPREQ_GET; data->set.method = HTTPREQ_GET;
data->set.upload = FALSE;
break; break;
#ifndef CURL_DISABLE_MIME #ifndef CURL_DISABLE_MIME
@ -888,7 +887,6 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
*/ */
if(va_arg(param, long)) { if(va_arg(param, long)) {
data->set.method = HTTPREQ_GET; data->set.method = HTTPREQ_GET;
data->set.upload = FALSE; /* switch off upload */
data->set.opt_no_body = FALSE; /* this is implied */ data->set.opt_no_body = FALSE; /* this is implied */
} }
break; break;

6
lib/smb.c
Просмотреть файл

@ -530,7 +530,7 @@ static CURLcode smb_send_open(struct Curl_easy *data)
byte_count = strlen(req->path); byte_count = strlen(req->path);
msg.name_length = smb_swap16((unsigned short)byte_count); msg.name_length = smb_swap16((unsigned short)byte_count);
msg.share_access = smb_swap32(SMB_FILE_SHARE_ALL); msg.share_access = smb_swap32(SMB_FILE_SHARE_ALL);
if(data->set.upload) { if(data->state.upload) {
msg.access = smb_swap32(SMB_GENERIC_READ | SMB_GENERIC_WRITE); msg.access = smb_swap32(SMB_GENERIC_READ | SMB_GENERIC_WRITE);
msg.create_disposition = smb_swap32(SMB_FILE_OVERWRITE_IF); msg.create_disposition = smb_swap32(SMB_FILE_OVERWRITE_IF);
} }
@ -762,7 +762,7 @@ static CURLcode smb_request_state(struct Curl_easy *data, bool *done)
void *msg = NULL; void *msg = NULL;
const struct smb_nt_create_response *smb_m; const struct smb_nt_create_response *smb_m;
if(data->set.upload && (data->state.infilesize < 0)) { if(data->state.upload && (data->state.infilesize < 0)) {
failf(data, "SMB upload needs to know the size up front"); failf(data, "SMB upload needs to know the size up front");
return CURLE_SEND_ERROR; return CURLE_SEND_ERROR;
} }
@ -813,7 +813,7 @@ static CURLcode smb_request_state(struct Curl_easy *data, bool *done)
smb_m = (const struct smb_nt_create_response*) msg; smb_m = (const struct smb_nt_create_response*) msg;
req->fid = smb_swap16(smb_m->fid); req->fid = smb_swap16(smb_m->fid);
data->req.offset = 0; data->req.offset = 0;
if(data->set.upload) { if(data->state.upload) {
data->req.size = data->state.infilesize; data->req.size = data->state.infilesize;
Curl_pgrsSetUploadSize(data, data->req.size); Curl_pgrsSetUploadSize(data, data->req.size);
next_state = SMB_UPLOAD; next_state = SMB_UPLOAD;

4
lib/smtp.c
Просмотреть файл

@ -1419,7 +1419,7 @@ static CURLcode smtp_done(struct Curl_easy *data, CURLcode status,
result = status; /* use the already set error code */ result = status; /* use the already set error code */
} }
else if(!data->set.connect_only && data->set.mail_rcpt && else if(!data->set.connect_only && data->set.mail_rcpt &&
(data->set.upload || data->set.mimepost.kind)) { (data->state.upload || data->set.mimepost.kind)) {
/* Calculate the EOB taking into account any terminating CRLF from the /* Calculate the EOB taking into account any terminating CRLF from the
previous line of the email or the CRLF of the DATA command when there previous line of the email or the CRLF of the DATA command when there
is "no mail data". RFC-5321, sect. 4.1.1.4. is "no mail data". RFC-5321, sect. 4.1.1.4.
@ -1511,7 +1511,7 @@ static CURLcode smtp_perform(struct Curl_easy *data, bool *connected,
smtp->eob = 2; smtp->eob = 2;
/* Start the first command in the DO phase */ /* Start the first command in the DO phase */
if((data->set.upload || data->set.mimepost.kind) && data->set.mail_rcpt) if((data->state.upload || data->set.mimepost.kind) && data->set.mail_rcpt)
/* MAIL transfer */ /* MAIL transfer */
result = smtp_perform_mail(data); result = smtp_perform_mail(data);
else else

8
lib/tftp.c
Просмотреть файл

@ -370,7 +370,7 @@ static CURLcode tftp_parse_option_ack(struct tftp_state_data *state,
/* tsize should be ignored on upload: Who cares about the size of the /* tsize should be ignored on upload: Who cares about the size of the
remote file? */ remote file? */
if(!data->set.upload) { if(!data->state.upload) {
if(!tsize) { if(!tsize) {
failf(data, "invalid tsize -:%s:- value in OACK packet", value); failf(data, "invalid tsize -:%s:- value in OACK packet", value);
return CURLE_TFTP_ILLEGAL; return CURLE_TFTP_ILLEGAL;
@ -451,7 +451,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state,
return result; return result;
} }
if(data->set.upload) { if(data->state.upload) {
/* If we are uploading, send an WRQ */ /* If we are uploading, send an WRQ */
setpacketevent(&state->spacket, TFTP_EVENT_WRQ); setpacketevent(&state->spacket, TFTP_EVENT_WRQ);
state->data->req.upload_fromhere = state->data->req.upload_fromhere =
@ -486,7 +486,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state,
if(!data->set.tftp_no_options) { if(!data->set.tftp_no_options) {
char buf[64]; char buf[64];
/* add tsize option */ /* add tsize option */
if(data->set.upload && (data->state.infilesize != -1)) if(data->state.upload && (data->state.infilesize != -1))
msnprintf(buf, sizeof(buf), "%" CURL_FORMAT_CURL_OFF_T, msnprintf(buf, sizeof(buf), "%" CURL_FORMAT_CURL_OFF_T,
data->state.infilesize); data->state.infilesize);
else else
@ -540,7 +540,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state,
break; break;
case TFTP_EVENT_OACK: case TFTP_EVENT_OACK:
if(data->set.upload) { if(data->state.upload) {
result = tftp_connect_for_tx(state, event); result = tftp_connect_for_tx(state, event);
} }
else { else {

4
lib/transfer.c
Просмотреть файл

@ -1293,6 +1293,7 @@ void Curl_init_CONNECT(struct Curl_easy *data)
{ {
data->state.fread_func = data->set.fread_func_set; data->state.fread_func = data->set.fread_func_set;
data->state.in = data->set.in_set; data->state.in = data->set.in_set;
data->state.upload = (data->state.httpreq == HTTPREQ_PUT);
} }
/* /*
@ -1732,7 +1733,6 @@ CURLcode Curl_follow(struct Curl_easy *data,
data->state.httpreq != HTTPREQ_POST_MIME) || data->state.httpreq != HTTPREQ_POST_MIME) ||
!(data->set.keep_post & CURL_REDIR_POST_303))) { !(data->set.keep_post & CURL_REDIR_POST_303))) {
data->state.httpreq = HTTPREQ_GET; data->state.httpreq = HTTPREQ_GET;
data->set.upload = false;
infof(data, "Switch to %s", infof(data, "Switch to %s",
data->req.no_body?"HEAD":"GET"); data->req.no_body?"HEAD":"GET");
} }
@ -1770,7 +1770,7 @@ CURLcode Curl_retry_request(struct Curl_easy *data, char **url)
/* if we're talking upload, we can't do the checks below, unless the protocol /* if we're talking upload, we can't do the checks below, unless the protocol
is HTTP as when uploading over HTTP we will still get a response */ is HTTP as when uploading over HTTP we will still get a response */
if(data->set.upload && if(data->state.upload &&
!(conn->handler->protocol&(PROTO_FAMILY_HTTP|CURLPROTO_RTSP))) !(conn->handler->protocol&(PROTO_FAMILY_HTTP|CURLPROTO_RTSP)))
return CURLE_OK; return CURLE_OK;

2
lib/urldata.h
Просмотреть файл

@ -1462,6 +1462,7 @@ struct UrlState {
BIT(rewindbeforesend);/* TRUE when the sending couldn't be stopped even BIT(rewindbeforesend);/* TRUE when the sending couldn't be stopped even
though it will be discarded. We must call the data though it will be discarded. We must call the data
rewind callback before trying to send again. */ rewind callback before trying to send again. */
BIT(upload); /* upload request */
}; };
/* /*
@ -1838,7 +1839,6 @@ struct UserDefined {
BIT(http_auto_referer); /* set "correct" referer when following BIT(http_auto_referer); /* set "correct" referer when following
location: */ location: */
BIT(opt_no_body); /* as set with CURLOPT_NOBODY */ BIT(opt_no_body); /* as set with CURLOPT_NOBODY */
BIT(upload); /* upload request */
BIT(verbose); /* output verbosity */ BIT(verbose); /* output verbosity */
BIT(krb); /* Kerberos connection requested */ BIT(krb); /* Kerberos connection requested */
BIT(reuse_forbid); /* forbidden to be reused, close after use */ BIT(reuse_forbid); /* forbidden to be reused, close after use */

6
lib/vssh/libssh.c
Просмотреть файл

@ -1209,7 +1209,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
} }
case SSH_SFTP_TRANS_INIT: case SSH_SFTP_TRANS_INIT:
if(data->set.upload) if(data->state.upload)
state(data, SSH_SFTP_UPLOAD_INIT); state(data, SSH_SFTP_UPLOAD_INIT);
else { else {
if(protop->path[strlen(protop->path)-1] == '/') if(protop->path[strlen(protop->path)-1] == '/')
@ -1802,7 +1802,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
/* Functions from the SCP subsystem cannot handle/return SSH_AGAIN */ /* Functions from the SCP subsystem cannot handle/return SSH_AGAIN */
ssh_set_blocking(sshc->ssh_session, 1); ssh_set_blocking(sshc->ssh_session, 1);
if(data->set.upload) { if(data->state.upload) {
if(data->state.infilesize < 0) { if(data->state.infilesize < 0) {
failf(data, "SCP requires a known file size for upload"); failf(data, "SCP requires a known file size for upload");
sshc->actualcode = CURLE_UPLOAD_FAILED; sshc->actualcode = CURLE_UPLOAD_FAILED;
@ -1907,7 +1907,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
break; break;
} }
case SSH_SCP_DONE: case SSH_SCP_DONE:
if(data->set.upload) if(data->state.upload)
state(data, SSH_SCP_SEND_EOF); state(data, SSH_SCP_SEND_EOF);
else else
state(data, SSH_SCP_CHANNEL_FREE); state(data, SSH_SCP_CHANNEL_FREE);

6
lib/vssh/libssh2.c
Просмотреть файл

@ -2019,7 +2019,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
} }
case SSH_SFTP_TRANS_INIT: case SSH_SFTP_TRANS_INIT:
if(data->set.upload) if(data->state.upload)
state(data, SSH_SFTP_UPLOAD_INIT); state(data, SSH_SFTP_UPLOAD_INIT);
else { else {
if(sshp->path[strlen(sshp->path)-1] == '/') if(sshp->path[strlen(sshp->path)-1] == '/')
@ -2691,7 +2691,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
break; break;
} }
if(data->set.upload) { if(data->state.upload) {
if(data->state.infilesize < 0) { if(data->state.infilesize < 0) {
failf(data, "SCP requires a known file size for upload"); failf(data, "SCP requires a known file size for upload");
sshc->actualcode = CURLE_UPLOAD_FAILED; sshc->actualcode = CURLE_UPLOAD_FAILED;
@ -2831,7 +2831,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
break; break;
case SSH_SCP_DONE: case SSH_SCP_DONE:
if(data->set.upload) if(data->state.upload)
state(data, SSH_SCP_SEND_EOF); state(data, SSH_SCP_SEND_EOF);
else else
state(data, SSH_SCP_CHANNEL_FREE); state(data, SSH_SCP_CHANNEL_FREE);

2
lib/vssh/wolfssh.c
Просмотреть файл

@ -557,7 +557,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
} }
break; break;
case SSH_SFTP_TRANS_INIT: case SSH_SFTP_TRANS_INIT:
if(data->set.upload) if(data->state.upload)
state(data, SSH_SFTP_UPLOAD_INIT); state(data, SSH_SFTP_UPLOAD_INIT);
else { else {
if(sftp_scp->path[strlen(sftp_scp->path)-1] == '/') if(sftp_scp->path[strlen(sftp_scp->path)-1] == '/')