From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 29 Sep 2021 08:06:42 +0000 (+0200)
Subject: easyoptions: add the two new PRE* options
X-Git-Tag: curl-7_80_0~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f53b89314ddbfe2b3b203a85c2181868c6151363;p=thirdparty%2Fcurl.git

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
---

diff --git a/lib/easyoptions.c b/lib/easyoptions.c
index 717b081a37..bc149e7be4 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 2a15f04389..abd80a8956 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