Changeset dff732d

Timestamp:

2011-11-12T15:49:52Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

03a8f8e

Parents:

dac74bd

Message:

Undoing old workaround for MSN troubles and added more proper fix. The
http_client module needs some refactoring though. Will do that later..
This should hopefully fix bug #850.

Files:

• lib/http_client.c (modified) (2 diffs)
• protocols/msn/soap.h (modified) (3 diffs)

lib/http_client.c

@@ -314 +314 @@
         }
         
-        if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 )
+        if( ( req->status_code >= 301 && req->status_code <= 303 ) && req->redir_ttl-- > 0 )
         {
                 char *loc, *new_request, *new_host;
@@ -375 +375 @@
                            going to use strcat(), whether you like it or not. :-) */
                         
-                        sprintf( new_request, "GET %s HTTP/1.0", url->file );
-                        
-                        s = strstr( req->request, "\r\n" );
-                        if( s == NULL )
+                        *s = 0;
+                        sprintf( new_request, "%s %s HTTP/1.0\r\nHost: %s",
+                                 req->status_code == 303 || req->request[0] == 'G' ? "GET" : "POST", url->file, url->host );
+                        *s = ' ';
+                        
+                        if( !( ( s = strstr( req->request, "\r\nHost: " ) ) &&
+                               ( s = strstr( s + strlen( "\r\nHost: " ), "\r\n" ) ) ) )
                         {
                                 req->status_string = g_strdup( "Error while rebuilding request string" );

protocols/msn/soap.h

@@ -116 +116 @@
                "<wsp:AppliesTo>" \
                    "<wsa:EndpointReference>" \
-                       "<wsa:Address>local-bay.contacts.msn.com</wsa:Address>" \
+                       "<wsa:Address>contacts.msn.com</wsa:Address>" \
                    "</wsa:EndpointReference>" \
                "</wsp:AppliesTo>" \
@@ -199 +199 @@
 "</soap:Envelope>"
 
-#define SOAP_MEMLIST_URL "http://local-bay.contacts.msn.com/abservice/SharingService.asmx"
+#define SOAP_MEMLIST_URL "http://contacts.msn.com/abservice/SharingService.asmx"
 #define SOAP_MEMLIST_ACTION "http://www.msn.com/webservices/AddressBook/FindMembership"
 
@@ -234 +234 @@
 
 
-#define SOAP_ADDRESSBOOK_URL "http://local-bay.contacts.msn.com/abservice/abservice.asmx"
+#define SOAP_ADDRESSBOOK_URL "http://contacts.msn.com/abservice/abservice.asmx"
 #define SOAP_ADDRESSBOOK_ACTION "http://www.msn.com/webservices/AddressBook/ABFindAll"