cpw.qulogic.msn: 577f0c9a: Don't free the SOAP message when we're s...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 577f0c9a9b02b6c1f402aaf2ba3ac954fa7b944c
Ancestor: 48f78161c1bcbd6b11d6daecff7e833a63850f31
Author: qulogic at pidgin.im
Date: 2008-06-17T04:11:18
Branch: im.pidgin.cpw.qulogic.msn
URL: http://d.pidgin.im/viewmtn/revision/info/577f0c9a9b02b6c1f402aaf2ba3ac954fa7b944c

Modified files:
        libpurple/protocols/msn/soap2.c

ChangeLog: 

Don't free the SOAP message when we're still using it for a redirect. 
Also, always specify a / at the beginning of the POST because 
purple_url_parse doesn't return it. I even tested redirects this time!

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/soap2.c	50a5a784aae0337cf5697dca6e6a993d44ecb181
+++ libpurple/protocols/msn/soap2.c	1528bf5b9da18f283433a41431c6a2f5375b267c
@@ -80,7 +80,7 @@ static void msn_soap_message_send_intern
 	MsnSoapMessage *message, const char *host, const char *path,
 	MsnSoapCallback cb, gpointer cb_data, gboolean first);
 
-static void msn_soap_request_destroy(MsnSoapRequest *req);
+static void msn_soap_request_destroy(MsnSoapRequest *req, gboolean keep_message);
 static void msn_soap_connection_sanitize(MsnSoapConnection *conn, gboolean disconnect);
 static gboolean msn_soap_write_cb_internal(gpointer data, gint fd, PurpleInputCondition cond, gboolean initial);
 static void msn_soap_process(MsnSoapConnection *conn);
@@ -191,7 +191,7 @@ msn_soap_handle_redirect(MsnSoapConnecti
 			conn->current_request->message,	host, path,
 			conn->current_request->cb, conn->current_request->cb_data, TRUE);
 
-		msn_soap_request_destroy(conn->current_request);
+		msn_soap_request_destroy(conn->current_request, TRUE);
 		conn->current_request = NULL;
 
 		g_free(host);
@@ -251,7 +251,7 @@ msn_soap_handle_body(MsnSoapConnection *
 		request->cb(request->message, response,
 			request->cb_data);
 		msn_soap_message_destroy(response);
-		msn_soap_request_destroy(request);
+		msn_soap_request_destroy(request, FALSE);
 	}
 
 	return TRUE;
@@ -486,7 +486,7 @@ msn_soap_connection_run(gpointer data)
 			conn->buf = g_string_new("");
 
 			g_string_append_printf(conn->buf,
-				"POST %s HTTP/1.1\r\n"
+				"POST /%s HTTP/1.1\r\n"
 				"SOAPAction: %s\r\n"
 				"Content-Type:text/xml; charset=utf-8\r\n"
 				"User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)\r\n"
@@ -589,7 +589,7 @@ msn_soap_connection_sanitize(MsnSoapConn
 	}
 
 	if (conn->current_request) {
-		msn_soap_request_destroy(conn->current_request);
+		msn_soap_request_destroy(conn->current_request, FALSE);
 		conn->current_request = NULL;
 	}
 }
@@ -616,7 +616,7 @@ msn_soap_connection_destroy_foreach_cb(g
 	if (req->cb)
 		req->cb(req->message, NULL, req->cb_data);
 
-	msn_soap_request_destroy(req);
+	msn_soap_request_destroy(req, FALSE);
 }
 
 static void
@@ -670,10 +670,11 @@ static void
 }
 
 static void
-msn_soap_request_destroy(MsnSoapRequest *req)
+msn_soap_request_destroy(MsnSoapRequest *req, gboolean keep_message)
 {
 	g_free(req->path);
-	msn_soap_message_destroy(req->message);
+	if (!keep_message)
+		msn_soap_message_destroy(req->message);
 	g_free(req);
 }