Attachment 121938 Details for Bug 165008 – patch.txt

patch.txt

patch.txt (text/plain; charset=US-ASCII), 2.52 KB, created by Mina R Waheeb on 2012-02-12 01:40:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mina R Waheeb

Created: 2012-02-12 01:40:11 UTC

Size: 2.52 KB

patch

obsolete

># HG changeset patch
># User Mina R Waheeb <mina@kemetex.com>
># Date 1329010023 0
># Node ID 39513d029462456801b06dbc2f018ad6a729df68
># Parent  81e1516235f5d072efb59e1cb06baa37018126d0
>Apply patch reflect the changes in MSN SOAP protocol
>
>PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/165008
>
>diff -r 81e1516235f5 -r 39513d029462 Makefile
>--- a/Makefile	Sun Feb 12 01:23:42 2012 +0000
>+++ b/Makefile	Sun Feb 12 01:27:03 2012 +0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	kmess
> PORTVERSION=	2.0.6.1
>+PORTREVISION=   1
> CATEGORIES=	net-im kde
> MASTER_SITES=	SF/${PORTNAME}/Latest%20versions/${PORTVERSION}/
> 
>diff -r 81e1516235f5 -r 39513d029462 files/patch-soap
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/files/patch-soap	Sun Feb 12 01:27:03 2012 +0000
>@@ -0,0 +1,33 @@
>+Follow Location redirects, MS seems to have moved some accounts to other
>+servers. Forum topic reference:
>+Connection problem to wlm - http://kmess.org/board/viewtopic.php?f=4&t=20549
>+diff -Nur a/src/network/soap/httpsoapconnection.cpp b/src/network/soap/httpsoapconnection.cpp
>+--- src/network/soap/httpsoapconnection.cpp	2011-02-16 08:16:45.000000000 +0100
>++++ src/network/soap/httpsoapconnection.cpp	2011-11-08 16:53:29.612517607 +0100
>+@@ -456,6 +456,7 @@
>+   const QByteArray& replyContents = reply->readAll();
>+   const int         statusCode    = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute   ).toInt();
>+   const QString     error         ( reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ).toString() );
>++  QUrl redirectUrl = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
>+ 
>+ #ifdef KMESSDEBUG_HTTPSOAPCONNECTION_GENERAL
>+   bool requestSuccess = false;
>+@@ -490,13 +491,16 @@
>+ #endif
>+ 
>+     // Parse the message contents
>+-    if( currentResponse->isFaultMessage() )
>++    if( !redirectUrl.isEmpty() || currentResponse->isFaultMessage() )
>+     {
>+-      // Verify if the server is redirecting us to another server
>+       if( currentResponse->getFaultCode() == "psf:Redirect" )
>+       {
>++        redirectUrl = XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" );
>++      }
>++      // Verify if the server is redirecting us to another server
>++      if( !redirectUrl.isEmpty() )
>++      {
>+         const QUrl& originalUrl = currentResponse->getEndPoint();
>+-        const QUrl redirectUrl( XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" ) );
>+         const QString originalHost( originalUrl.host() );
>+         const QString redirectHost( redirectUrl.host() );
>\ No newline at end of file

Actions: View

Attachments on bug 165008: 121937 | 121938