Changeset dd7b931

Timestamp:

2013-06-16T00:14:11Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ab19567

Parents:

777461b

Message:

Use HTTP/1.1 by default in the Twitter module, and stick to the initially
used protocol version when internally handling redirects.

Files:

• lib/http_client.c (modified) (4 diffs)
• protocols/twitter/twitter_http.c (modified) (1 diff)

lib/http_client.c

@@ -536 +536 @@
                         /* A whole URL */
                         url_t *url;
-                        char *s;
+                        char *s, *version, *headers;
                         const char *new_method;
                         
@@ -564 +564 @@
                                 return TRUE;
                         }
+                        headers = s;
                         
                         /* More or less HTTP/1.0 compliant, from my reading of RFC 2616.
@@ -583 +584 @@
                                 new_method = "POST";
                         
+                        if( ( version = strstr( req->request, " HTTP/" ) ) &&
+                            ( s = strstr( version, "\r\n" ) ) )
+                        {
+                                version ++;
+                                version = g_strndup( version, s - version );
+                        }
+                        else
+                                version = g_strdup( "HTTP/1.0" );
+                        
                         /* Okay, this isn't fun! We have to rebuild the request... :-( */
-                        new_request = g_strdup_printf( "%s %s HTTP/1.1\r\nHost: %s%s",
-                                                       new_method, url->file, url->host, s );
+                        new_request = g_strdup_printf( "%s %s %s\r\nHost: %s%s",
+                                                       new_method, url->file, version,
+                                                       url->host, headers );
                         
                         new_host = g_strdup( url->host );
@@ -597 +608 @@
                         
                         g_free( url );
+                        g_free( version );
                 }
                 

protocols/twitter/twitter_http.c

@@ -78 +78 @@
         
         // Make the request.
-        g_string_printf(request, "%s %s%s%s%s HTTP/1.0\r\n"
+        g_string_printf(request, "%s %s%s%s%s HTTP/1.1\r\n"
                         "Host: %s\r\n"
                         "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n",