Changeset 3fbce97 for lib/url.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• lib/url.c (modified) (1 diff)

lib/url.c

@@ -48 +48 @@
                 } else if (g_strncasecmp(set_url, "socks5", i - set_url) == 0) {
                         url->proto = PROTO_SOCKS5;
+                } else if (g_strncasecmp(set_url, "socks4a", i - set_url) == 0) {
+                        url->proto = PROTO_SOCKS4A;
                 } else {
                         return 0;