summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2021-09-29 10:06:42 +0200
committerDaniel Stenberg <daniel@haxx.se>2021-09-29 14:48:02 +0200
commitf53b89314ddbfe2b3b203a85c2181868c6151363 (patch)
tree5fd62ea51c8ea0e037d651de265593251de5875e /lib
parent180180a44d8e7a54b772af02eb90e0eab1c61d37 (diff)
downloadcurl-f53b89314ddbfe2b3b203a85c2181868c6151363.tar.gz
easyoptions: add the two new PRE* options
Follow-up to a517378de58358a Also fix optiontable.pl to do the correct remainder on the entry. Reported-by: Gisle Vanem Bug: https://github.com/curl/curl/commit/a517378de58358a85b7cfe9efecb56051268f629#commitcomment-57224830 Closes #7791
Diffstat (limited to 'lib')
-rw-r--r--lib/easyoptions.c2
-rw-r--r--lib/optiontable.pl2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/easyoptions.c b/lib/easyoptions.c
index 717b081a3..bc149e7be 100644
--- a/lib/easyoptions.c
+++ b/lib/easyoptions.c
@@ -192,6 +192,8 @@ struct curl_easyoption Curl_easyopts[] = {
{"POSTQUOTE", CURLOPT_POSTQUOTE, CURLOT_SLIST, 0},
{"POSTREDIR", CURLOPT_POSTREDIR, CURLOT_VALUES, 0},
{"PREQUOTE", CURLOPT_PREQUOTE, CURLOT_SLIST, 0},
+ {"PREREQDATA", CURLOPT_PREREQDATA, CURLOT_CBPTR, 0},
+ {"PREREQFUNCTION", CURLOPT_PREREQFUNCTION, CURLOT_FUNCTION, 0},
{"PRE_PROXY", CURLOPT_PRE_PROXY, CURLOT_STRING, 0},
{"PRIVATE", CURLOPT_PRIVATE, CURLOT_OBJECT, 0},
{"PROGRESSDATA", CURLOPT_XFERINFODATA, CURLOT_CBPTR, CURLOT_FLAG_ALIAS},
diff --git a/lib/optiontable.pl b/lib/optiontable.pl
index 2a15f0438..abd80a895 100644
--- a/lib/optiontable.pl
+++ b/lib/optiontable.pl
@@ -111,7 +111,7 @@ print <<FOOT
*/
int Curl_easyopts_check(void)
{
- return (CURLOPT_LASTENTRY != ($lastnum + 1));
+ return ((CURLOPT_LASTENTRY%10000) != ($lastnum + 1));
}
#endif
FOOT