luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revert-eb12afed' into 'main'

Browse Source 
Revert "gsimpleproxyresolver: Make explicit that a port is needed for HTTP/HTTPS"

Closes #2832

See merge request GNOME/glib!3110
This commit is contained in:
Philip Withnall 2022-12-22 21:57:39 +00:00
commit f0bc060e89
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gproxyresolver.c
View File

@ -131,7 +131,7 @@ g_proxy_resolver_is_supported (GProxyResolver *resolver)
* *
* Looks into the system proxy configuration to determine what proxy, * Looks into the system proxy configuration to determine what proxy,
* if any, to use to connect to @uri. The returned proxy URIs are of * if any, to use to connect to @uri. The returned proxy URIs are of
* the form `<protocol>://[user[:password]@]host:port` or * the form `<protocol>://[user[:password]@]host[:port]` or
* `direct://`, where <protocol> could be http, rtsp, socks * `direct://`, where <protocol> could be http, rtsp, socks
* or other proxying protocol. * or other proxying protocol.
* *

4
gio/gsimpleproxyresolver.c
View File

@ -426,10 +426,6 @@ g_simple_proxy_resolver_class_init (GSimpleProxyResolverClass *resolver_class)
* Note that as a special case, if this URI starts with * Note that as a special case, if this URI starts with
* "socks://", #GSimpleProxyResolver will treat it as referring * "socks://", #GSimpleProxyResolver will treat it as referring
* to all three of the socks5, socks4a, and socks4 proxy types. * to all three of the socks5, socks4a, and socks4 proxy types.
*
* If you are making an HTTP or HTTPS proxy resolver, you must explicitly
* add the port to the URI even if the default port is used. For example:
* `https://example.com:443` or `http://example.com:80`.
*/ */
g_object_class_install_property (object_class, PROP_DEFAULT_PROXY, g_object_class_install_property (object_class, PROP_DEFAULT_PROXY,
g_param_spec_string ("default-proxy", g_param_spec_string ("default-proxy",