mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-27 05:50:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

curl.h: add CURLPROTO_GOPHERS as own protocol identifier

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

Closes #6418
This commit is contained in:
Daniel Stenberg 2021-01-05 17:22:09 +01:00
parent ab525c059e
commit f52c6981c5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/libcurl/symbols-in-versions
View File

@ -703,6 +703,7 @@ CURLPROTO_FILE 7.19.4
CURLPROTO_FTP 7.19.4 CURLPROTO_FTP 7.19.4
CURLPROTO_FTPS 7.19.4 CURLPROTO_FTPS 7.19.4
CURLPROTO_GOPHER 7.21.2 CURLPROTO_GOPHER 7.21.2
CURLPROTO_GOPHERS 7.75.0
CURLPROTO_HTTP 7.19.4 CURLPROTO_HTTP 7.19.4
CURLPROTO_HTTPS 7.19.4 CURLPROTO_HTTPS 7.19.4
CURLPROTO_IMAP 7.20.0 CURLPROTO_IMAP 7.20.0

1
include/curl/curl.h
View File

@ -1016,6 +1016,7 @@ typedef CURLSTScode (*curl_hstswrite_callback)(CURL *easy,
#define CURLPROTO_SMB (1<<26) #define CURLPROTO_SMB (1<<26)
#define CURLPROTO_SMBS (1<<27) #define CURLPROTO_SMBS (1<<27)
#define CURLPROTO_MQTT (1<<28) #define CURLPROTO_MQTT (1<<28)
#define CURLPROTO_GOPHERS (1<<29)
#define CURLPROTO_ALL (~0) /* enable everything */ #define CURLPROTO_ALL (~0) /* enable everything */
/* long may be 32 or 64 bits, but we should never depend on anything else /* long may be 32 or 64 bits, but we should never depend on anything else

4
lib/gopher.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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, /* readwrite */
ZERO_NULL, /* connection_check */ ZERO_NULL, /* connection_check */
PORT_GOPHER, /* defport */ PORT_GOPHER, /* defport */
CURLPROTO_GOPHER, /* protocol */ CURLPROTO_GOPHERS, /* protocol */
CURLPROTO_GOPHER, /* family */ CURLPROTO_GOPHER, /* family */
PROTOPT_SSL /* flags */ PROTOPT_SSL /* flags */
}; };

5
src/tool_libinfo.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -55,15 +55,18 @@ CURLcode get_libcurl_info(void)
{ "ftp", CURLPROTO_FTP }, { "ftp", CURLPROTO_FTP },
{ "ftps", CURLPROTO_FTPS }, { "ftps", CURLPROTO_FTPS },
{ "gopher", CURLPROTO_GOPHER }, { "gopher", CURLPROTO_GOPHER },
{ "gophers",CURLPROTO_GOPHERS},
{ "http", CURLPROTO_HTTP }, { "http", CURLPROTO_HTTP },
{ "https", CURLPROTO_HTTPS }, { "https", CURLPROTO_HTTPS },
{ "imap", CURLPROTO_IMAP }, { "imap", CURLPROTO_IMAP },
{ "imaps", CURLPROTO_IMAPS }, { "imaps", CURLPROTO_IMAPS },
{ "ldap", CURLPROTO_LDAP }, { "ldap", CURLPROTO_LDAP },
{ "ldaps", CURLPROTO_LDAPS }, { "ldaps", CURLPROTO_LDAPS },
{ "mqtt", CURLPROTO_MQTT },
{ "pop3", CURLPROTO_POP3 }, { "pop3", CURLPROTO_POP3 },
{ "pop3s", CURLPROTO_POP3S }, { "pop3s", CURLPROTO_POP3S },
{ "rtmp", CURLPROTO_RTMP }, { "rtmp", CURLPROTO_RTMP },
{ "rtmps", CURLPROTO_RTMPS },
{ "rtsp", CURLPROTO_RTSP }, { "rtsp", CURLPROTO_RTSP },
{ "scp", CURLPROTO_SCP }, { "scp", CURLPROTO_SCP },
{ "sftp", CURLPROTO_SFTP }, { "sftp", CURLPROTO_SFTP },