Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/soap.c @ 24943:1eedb375c937

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disapproval of revision '86902651768595e46a7e1225a210055c92954448'
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 11 Jan 2009 22:28:21 +0000
parents 7d6866244106
children b474cd321e88
comparison
equal deleted inserted replaced
24942:7d6866244106 24943:1eedb375c937
66 66
67 MsnSoapMessage *message; 67 MsnSoapMessage *message;
68 68
69 GQueue *queue; 69 GQueue *queue;
70 MsnSoapRequest *current_request; 70 MsnSoapRequest *current_request;
71 gboolean unsafe_debug;
72 } MsnSoapConnection; 71 } MsnSoapConnection;
73 72
74 static gboolean msn_soap_connection_run(gpointer data); 73 static gboolean msn_soap_connection_run(gpointer data);
75 74
76 static MsnSoapConnection * 75 static MsnSoapConnection *
78 { 77 {
79 MsnSoapConnection *conn = g_new0(MsnSoapConnection, 1); 78 MsnSoapConnection *conn = g_new0(MsnSoapConnection, 1);
80 conn->session = session; 79 conn->session = session;
81 conn->host = g_strdup(host); 80 conn->host = g_strdup(host);
82 conn->queue = g_queue_new(); 81 conn->queue = g_queue_new();
83 conn->unsafe_debug = g_getenv("PURPLE_MSN_UNSAFE_DEBUG") != NULL;
84 return conn; 82 return conn;
85 } 83 }
86 84
87 static void 85 static void
88 msn_soap_message_destroy(MsnSoapMessage *message) 86 msn_soap_message_destroy(MsnSoapMessage *message)
504 502
505 perrno = errno; 503 perrno = errno;
506 if (cnt < 0 && perrno != EAGAIN) 504 if (cnt < 0 && perrno != EAGAIN)
507 purple_debug_info("soap", "read: %s\n", g_strerror(perrno)); 505 purple_debug_info("soap", "read: %s\n", g_strerror(perrno));
508 506
509 if (conn->current_request && conn->current_request->secure && 507 #ifndef MSN_UNSAFE_DEBUG
510 !conn->unsafe_debug) 508 if (conn->current_request && conn->current_request->secure)
511 purple_debug_misc("soap", "Received secure request.\n"); 509 purple_debug_misc("soap", "Received secure request.\n");
512 else if (count != 0) 510 else
511 #endif
512 if (count != 0)
513 purple_debug_misc("soap", "current %s\n", conn->buf->str + cursor); 513 purple_debug_misc("soap", "current %s\n", conn->buf->str + cursor);
514 514
515 /* && count is necessary for Adium, on OS X the last read always 515 /* && count is necessary for Adium, on OS X the last read always
516 return an error, so we want to proceed anyway. See #5212 for 516 return an error, so we want to proceed anyway. See #5212 for
517 discussion on this and the above buffer size issues */ 517 discussion on this and the above buffer size issues */
655 } 655 }
656 656
657 g_string_append(conn->buf, "\r\n"); 657 g_string_append(conn->buf, "\r\n");
658 g_string_append(conn->buf, body); 658 g_string_append(conn->buf, body);
659 659
660 if (req->secure && !conn->unsafe_debug) 660 #ifndef MSN_UNSAFE_DEBUG
661 if (req->secure)
661 purple_debug_misc("soap", "Sending secure request.\n"); 662 purple_debug_misc("soap", "Sending secure request.\n");
662 else 663 else
663 purple_debug_misc("soap", "%s\n", conn->buf->str); 664 #endif
665 purple_debug_misc("soap", "%s\n", conn->buf->str);
664 666
665 conn->handled_len = 0; 667 conn->handled_len = 0;
666 conn->current_request = req; 668 conn->current_request = req;
667 669
668 conn->event_handle = purple_input_add(conn->ssl->fd, 670 conn->event_handle = purple_input_add(conn->ssl->fd,