[38084] trunk/dports/devel/ice-cpp

[blair at macports.org]

Revision: 38084
          http://trac.macosforge.org/projects/macports/changeset/38084
Author:   blair at macports.org
Date:     2008-07-05 17:27:10 -0700 (Sat, 05 Jul 2008)
Log Message:
-----------
Upstream patch to fix an issue with Ice clients using Bzip2
compression even when the server does not accept compressed messages.

Modified Paths:
--------------
    trunk/dports/devel/ice-cpp/Portfile

Added Paths:
-----------
    trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff

Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile	2008-07-05 23:58:35 UTC (rev 38083)
+++ trunk/dports/devel/ice-cpp/Portfile	2008-07-06 00:27:10 UTC (rev 38084)
@@ -4,7 +4,7 @@
 
 name		ice-cpp
 version		3.3.0
-revision	1
+revision	2
 categories	devel
 maintainers	blair
 description	Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -58,8 +58,10 @@
 
 patchfiles	patch-ice.cpp.config.Make.rules.diff \
 		patch-ice.cpp.config.Make.rules.Darwin.diff \
+		patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff \
 		patch-mcpp-${mcpp_version}-1.diff \
 		patch-mcpp-${mcpp_version}-2.diff
+
 patch {
 	set cmd "cd ${workpath}/mcpp-${mcpp_version} && patch -p0 < ${filespath}/patch-mcpp-${mcpp_version}-1.diff"
 	ui_debug ${cmd}
@@ -77,6 +79,10 @@
 	ui_debug ${cmd}
 	system ${cmd}
 
+	set cmd "cd ${workpath}/Ice-${version} && patch -p0 < ${filespath}/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff"
+	ui_debug ${cmd}
+	system ${cmd}
+
 	reinplace "s/-O2/-g -O2/" ${workpath}/Ice-${version}/cpp/config/Make.rules.Darwin
 
 	# It appears that the 10.4 and 10.5 installed versions of

Added: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectRequestHandler.cpp.diff	2008-07-06 00:27:10 UTC (rev 38084)
@@ -0,0 +1,14 @@
+--- cpp/src/Ice/ConnectRequestHandler.cpp
++++ cpp/src/Ice/ConnectRequestHandler.cpp
+@@ -212,7 +212,10 @@ ConnectRequestHandler::abortBatchRequest()
+ Ice::ConnectionI*
+ ConnectRequestHandler::sendRequest(Outgoing* out)
+ {
+-    if(!getConnection(true)->sendRequest(out, _compress, _response) || _response)
++    // Must be called first, _compress might not be initialized before this returns.
++    Ice::ConnectionIPtr connection = getConnection(true);
++    assert(connection);
++    if(!connection->sendRequest(out, _compress, _response) || _response)
+     {
+         return _connection.get(); // The request has been sent or we're expecting a response.
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080705/66a6d174/attachment.html