mirror of
https://github.com/curl/curl.git
synced 2026-07-26 17:47:28 +03:00
curl: upload from '.' fix
CURLOPT_NOPROGRESS is being set twice, if a file is uploaded from '.'. Fix order of options so that '.' can override the global setting. Without this, the `tool_readbusy_cb()` is never inoked and cannot unpause a transfer waiting for more input. Fixes #17513 Reported-by: denandz on github Closes #17517
This commit is contained in:
parent
d591bc1416
commit
78dd083788
12 changed files with 38 additions and 30 deletions
|
|
@ -82,14 +82,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -101,14 +101,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -87,14 +87,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -82,14 +82,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -157,14 +157,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -102,14 +102,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -93,14 +93,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -73,14 +73,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -78,14 +78,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -90,14 +90,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
|
|
@ -88,14 +88,14 @@ int main(int argc, char *argv[])
|
|||
as source easily. You may choose to either not use them or implement
|
||||
them yourself.
|
||||
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_WRITEDATA was set to an object pointer
|
||||
CURLOPT_WRITEFUNCTION was set to a function pointer
|
||||
CURLOPT_READDATA was set to an object pointer
|
||||
CURLOPT_READFUNCTION was set to a function pointer
|
||||
CURLOPT_SEEKDATA was set to an object pointer
|
||||
CURLOPT_SEEKFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
||||
CURLOPT_DEBUGDATA was set to an object pointer
|
||||
CURLOPT_HEADERFUNCTION was set to a function pointer
|
||||
CURLOPT_HEADERDATA was set to an object pointer
|
||||
CURLOPT_ERRORBUFFER was set to an object pointer
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue