mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

Remove conflicting dependency on libungif, giflib is already pulled in as a

Browse Source 
dependency

Fix receiving of the Contact list by following Location redirects

PR:		165008
Submitted by:	Axel Gonzales
Approved by:	maintainer
This commit is contained in:
Tilman Keskinoz 2012-02-27 14:14:20 +00:00
parent a7d142473a
commit 99ede11a3a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=292302
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net-im/kmess-kde4/Makefile
View File

@ -7,15 +7,14 @@
PORTNAME= kmess
PORTVERSION= 2.0.6.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-im kde
MASTER_SITES= SF/${PORTNAME}/Latest%20versions/${PORTVERSION}/
MAINTAINER= syncer@gmail.com
COMMENT= MSN Messenger client for KDE
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
qca.2:${PORTSDIR}/devel/qca
LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca
BUILD_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl

33
net-im/kmess-kde4/files/patch-soap Normal file
View File

@ -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() );