Changeset 55ec2d6 for url.c

Timestamp:

2006-01-20T12:22:30Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f73b969

Parents:

fc50d48 (diff), b8c2ace (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:

Merging IPC branch, it's too different from the main code to keep it
separated (and it's pretty stable now). Have fun. :-)

File:

• url.c (modified) (1 diff)

url.c

@@ -40 +40 @@
         else
         {
-                if( g_strncasecmp( set_url, "https", i - set_url ) == 0 )
+                if( g_strncasecmp( set_url, "http", i - set_url ) == 0 )
+                        url->proto = PROTO_HTTP;
+                else if( g_strncasecmp( set_url, "https", i - set_url ) == 0 )
                         url->proto = PROTO_HTTPS;
-                else if( g_strncasecmp( set_url, "http", i - set_url ) == 0 )
-                        url->proto = PROTO_HTTP;
                 else if( g_strncasecmp( set_url, "socks4", i - set_url ) == 0 )
                         url->proto = PROTO_SOCKS4;