test1521: verify setting options better #14634
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bagder
force-pushed
the
bagder/1521-NULL-check
branch
from
a6f74ad
to
3da3e88
Compare
bagder
force-pushed
the
bagder/1521-NULL-check
branch
from
298a135
to
7fa64c3
Compare
bagder
added a commit
that referenced
this pull request
Aug 22, 2024
instead of returning an error code to the getinfo() call Closes #14634
bagder
added a commit
that referenced
this pull request
Aug 22, 2024
Previously this test allowed a few error values when setting a pointer setopt to NULL, which made this test miss #14629. Now, no errors are accepted for setopts - but now we also check that the variable exists before setting it. As a consequence, CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR both now also support NULL as a way to restore back to default values. In curl.h: remove the OBSOLETE named values from the setopt list. Closes #14634
bagder
force-pushed
the
bagder/1521-NULL-check
branch
from
7fa64c3
to
824bf82
Compare
bagder
added a commit
that referenced
this pull request
Aug 22, 2024
instead of returning an error code to the getinfo() call Closes #14634
bagder
added a commit
that referenced
this pull request
Aug 22, 2024
Previously this test allowed several error values when setting options. This made this test miss #14629. Now, errors are generally not accepted for setopts: - numerical setopts accept CURLE_BAD_FUNCTION_ARGUMENT for funny input - the first setopt to an option accepts CURLE_NOT_BUILT_IN or CURLE_UNKNOWN_OPTION for when they are disabled/not built-in - there is an allowlist concept for some return code for some variables, managed at the top of the mk-lib1521.pl script In curl.h: remove the OBSOLETE named values from the setopt list. Closes #14634
bagder
force-pushed
the
bagder/1521-NULL-check
branch
from
824bf82
to
22a32b4
Compare
bagder
changed the title
instead of returning an error code to the getinfo() call Closes #14634
... and just move them into the accepted range.
Previously this test allowed several error values when setting options. This made this test miss #14629. Now, errors are generally not accepted for setopts: - numerical setopts accept CURLE_BAD_FUNCTION_ARGUMENT for funny input - the first setopt to an option accepts CURLE_NOT_BUILT_IN or CURLE_UNKNOWN_OPTION for when they are disabled/not built-in - there is an allowlist concept for some return code for some variables, managed at the top of the mk-lib1521.pl script In curl.h: remove the OBSOLETE named values from the setopt list. Closes #14634
bagder
force-pushed
the
bagder/1521-NULL-check
branch
from
9c14869
to
ccdde79
Compare
bagder
added a commit
that referenced
this pull request
Aug 23, 2024
Because NULL is documented as default and most options that take pointers accept NULL to reset back to internal default. Closes #14634
bagder
added a commit
that referenced
this pull request
Aug 23, 2024
... and just move them into the accepted range. Like how buffersize and a few other options work. Closes #14634
bagder
added a commit
that referenced
this pull request
Aug 23, 2024
Previously this test allowed several error values when setting options. This made this test miss #14629. Now, errors are generally not accepted for setopts: - numerical setopts accept CURLE_BAD_FUNCTION_ARGUMENT for funny input - the first setopt to an option accepts CURLE_NOT_BUILT_IN or CURLE_UNKNOWN_OPTION for when they are disabled/not built-in - there is an allowlist concept for some return code for some variables, managed at the top of the mk-lib1521.pl script In curl.h: remove the OBSOLETE named values from the setopt list. Closes #14634
dg0yt
reviewed
Aug 31, 2024
Comment on lines
-1355
to
+1354
| /* OBSOLETE, do not use! */ | ||
| CURLOPT(CURLOPT_OBSOLETE72, CURLOPTTYPE_LONG, 72), | ||
|
|
||
| /* 72 = OBSOLETE */ |
There was a problem hiding this comment.
Noticed in vpckg CI run on CURL HEAD:
CURLOPT_OBSOLETE72 is still used in the header for
Line 723 in 3fc81be
and CURLOPT_CLOSEPOLICY is used downstream in curlpp and curlcpp.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously this test allowed several error values when setting options. This made this test miss #14629.
Now, errors are generally not accepted for setopts:
In curl.h: remove the OBSOLETE named values from the setopt list.