gen.pl: error on duplicated See-Also fields

Updated http2.d accordingly.
curl · Apr 11, 2023 · 5a3f535 · 5a3f535
1 parent aafb79d
commit 5a3f535
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/docs/cmdline-opts/gen.pl b/docs/cmdline-opts/gen.pl
@@ -241,6 +241,10 @@ sub single {
             $protocols=$1;
         }
         elsif(/^See-also: *(.*)/i) {
+            if($seealso) {
+                print STDERR "ERROR: duplicated See-also in $f\n";
+                return 1;
+            }
             $seealso=$1;
         }
         elsif(/^Requires: *(.*)/i) {

diff --git a/docs/cmdline-opts/http2.d b/docs/cmdline-opts/http2.d
@@ -6,9 +6,8 @@ Protocols: HTTP
 Added: 7.33.0
 Mutexed: http1.1 http1.0 http2-prior-knowledge http3
 Requires: HTTP/2
-See-also: no-alpn
-Help: Use HTTP 2
-See-also: http1.1 http3
+Help: Use HTTP/2
+See-also: http1.1 http3 no-alpn
 Category: http
 Example: --http2 $URL
 Multi: mutex

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
@@ -211,6 +211,7 @@ static const struct LongShort aliases[]= {
   {"04",  "http3",                   ARG_NONE},
   {"05",  "http3-only",              ARG_NONE},
   {"09",  "http0.9",                 ARG_BOOL},
+  {"0a",  "proxy-http2",             ARG_BOOL},
   {"1",  "tlsv1",                    ARG_NONE},
   {"10",  "tlsv1.0",                 ARG_NONE},
   {"11",  "tlsv1.1",                 ARG_NONE},
@@ -1449,6 +1450,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
         /* Allow HTTP/0.9 responses! */
         config->http09_allowed = toggle;
         break;
+      case 'a':
+        /* --proxy-http2 */
+        config->proxyver = CURLPROXY_HTTPS2;
+        break;
       }
       break;
     case '1': /* --tlsv1* options */
@@ -2373,7 +2378,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
       default:
         /* --proxy */
         GetStr(&config->proxy, nextarg);
-        config->proxyver = CURLPROXY_HTTP;
+        if(config->proxyver != CURLPROXY_HTTPS2)
+          config->proxyver = CURLPROXY_HTTP;
         break;
       }
       break;