curl.h: add CURLPROTO_GOPHERS as own protocol identifier

Follow-up to a1f06f32b860, to make sure it can be handled separately
from plain gopher.

Closes #6418

diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions
index 86cbe99fcd438dc3ce1659cc68c21bcc08fed27b..0b633e41ca3dc10835bc4b646a638be2c4776aa5 100644 (file)
--- a/docs/libcurl/symbols-in-versions
+++ b/docs/libcurl/symbols-in-versions
@@ -703,6 +703,7 @@ CURLPROTO_FILE                  7.19.4
 CURLPROTO_FTP                   7.19.4
 CURLPROTO_FTPS                  7.19.4
 CURLPROTO_GOPHER                7.21.2
+CURLPROTO_GOPHERS               7.75.0
 CURLPROTO_HTTP                  7.19.4
 CURLPROTO_HTTPS                 7.19.4
 CURLPROTO_IMAP                  7.20.0

diff --git a/include/curl/curl.h b/include/curl/curl.h
index 6b5f97a5ea9ba48b5375228d927268e46c96b804..3c0461bc25f6a750de78ba36873b3726500f3b22 100644 (file)
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1016,6 +1016,7 @@ typedef CURLSTScode (*curl_hstswrite_callback)(CURL *easy,
 #define CURLPROTO_SMB    (1<<26)
 #define CURLPROTO_SMBS   (1<<27)
 #define CURLPROTO_MQTT   (1<<28)
+#define CURLPROTO_GOPHERS (1<<29)
 #define CURLPROTO_ALL    (~0) /* enable everything */
 
 /* long may be 32 or 64 bits, but we should never depend on anything else

diff --git a/lib/gopher.c b/lib/gopher.c
index c02436d4a1fe9d7634328436b3d0cbe67ad0edd0..0f6825ef255c5305d7152a6795b22a6768cedfa4 100644 (file)
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -98,7 +98,7 @@ const struct Curl_handler Curl_handler_gophers = {
   ZERO_NULL,                            /* readwrite */
   ZERO_NULL,                            /* connection_check */
   PORT_GOPHER,                          /* defport */
-  CURLPROTO_GOPHER,                     /* protocol */
+  CURLPROTO_GOPHERS,                    /* protocol */
   CURLPROTO_GOPHER,                     /* family */
   PROTOPT_SSL                           /* flags */
 };

diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c
index 1b0f98e08727607e697fae0ea875c1a5124825db..58088eab0eb8832dc72f4180393474e4c29c1f2b 100644 (file)
--- a/src/tool_libinfo.c
+++ b/src/tool_libinfo.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -55,15 +55,18 @@ CURLcode get_libcurl_info(void)
     { "ftp",    CURLPROTO_FTP    },
     { "ftps",   CURLPROTO_FTPS   },
     { "gopher", CURLPROTO_GOPHER },
+    { "gophers",CURLPROTO_GOPHERS},
     { "http",   CURLPROTO_HTTP   },
     { "https",  CURLPROTO_HTTPS  },
     { "imap",   CURLPROTO_IMAP   },
     { "imaps",  CURLPROTO_IMAPS  },
     { "ldap",   CURLPROTO_LDAP   },
     { "ldaps",  CURLPROTO_LDAPS  },
+    { "mqtt",   CURLPROTO_MQTT   },
     { "pop3",   CURLPROTO_POP3   },
     { "pop3s",  CURLPROTO_POP3S  },
     { "rtmp",   CURLPROTO_RTMP   },
+    { "rtmps",  CURLPROTO_RTMPS  },
     { "rtsp",   CURLPROTO_RTSP   },
     { "scp",    CURLPROTO_SCP    },
     { "sftp",   CURLPROTO_SFTP   },