[python-qpid] Fixes for bz622699 bz621527 bz624715 bz624714
Rafael Schloming
rhs at fedoraproject.org
Tue Aug 17 19:39:09 UTC 2010
commit 27ae5258856d3d2f2d3fe161fab0d8affed7967e
Author: Rafael H. Schloming <rafaels at redhat.com>
Date: Tue Aug 17 15:38:34 2010 -0400
Fixes for bz622699 bz621527 bz624715 bz624714
0001-BZ-597066.patch | 2 +-
...Fixed-connection.start-hangs-if-connectio.patch | 2 +-
...Fixed-qpid-python-high-level-API-clients-.patch | 2 +-
...dded-back-values-method-for-backwards-com.patch | 2 +-
0005-BZ-567249-fix-for-python-2.3.patch | 2 +-
...erformance-tweaks-for-receive-added-confi.patch | 2 +-
...817-don-t-always-set-the-sync-bit-on-send.patch | 2 +-
...eset-reconnect-delay-after-successful-con.patch | 2 +-
...dded-full-support-for-unreliable-at-least.patch | 2 +-
...dded-optional-timeouts-to-connection-sess.patch | 2 +-
...dded-support-for-x-amqp-0-10.-app-id-cont.patch | 2 +-
...ake-sure-we-initialize-properties-even-if.patch | 2 +-
...ix-timeout-tests-to-not-leave-queues-lyin.patch | 2 +-
...dd-uuid-prefix-to-addresses-beginning-wit.patch | 2 +-
...-fix-mangling-for-addresses-that-are-None.patch | 2 +-
0016-BZ-608807-fixed-concurrent-close.patch | 2 +-
...Z-609258-added-accessor-for-auth_username.patch | 2 +-
0018-BZ-609258-fixed-auth-username-for-sasl.patch | 2 +-
...Assertion-when-raising-a-link-established.patch | 2 +-
...-convert-ttl-from-seconds-to-milliseconds.patch | 2 +-
...ixed-payload-of-None-for-text-plain-messa.patch | 2 +-
0022-removed-old-python-examples.patch | 2 +-
...ixed-missign-import-and-added-test-case-f.patch | 2 +-
...liminate-spurious-error-logging-and-recon.patch | 2 +-
...ixed-parsing-of-failover-URLs-fixed-drive.patch | 2 +-
...Z-614344-default-ports-for-reconnect_urls.patch | 2 +-
...ixed-bug-in-flow-control-logic-added-test.patch | 2 +-
0028-BZ-621998-fixed-heartbeating.patch | 2 +-
...ditional-assignment-to-vanilla-if-then-el.patch | 2 +-
...ally-Python-before-2.5-did-not-allow-fina.patch | 2 +-
...ManagementTest.test_broker_connectivity_o.patch | 59 +++++++++++++++
0032-BZ-621527-default-sasl-service-to-qpidd.patch | 27 +++++++
...ix-error-reporting-for-negotiation-failur.patch | 43 +++++++++++
0034-BZ-624714-fixed-reply-to-conversion.patch | 79 ++++++++++++++++++++
python-qpid.spec | 17 ++++-
35 files changed, 254 insertions(+), 31 deletions(-)
---
diff --git a/0001-BZ-597066.patch b/0001-BZ-597066.patch
index cd0ecc3..960457b 100644
--- a/0001-BZ-597066.patch
+++ b/0001-BZ-597066.patch
@@ -1,7 +1,7 @@
From 7f006841387b54cb0165cfa6d1423cd3fae06ce2 Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim at apache.org>
Date: Tue, 1 Jun 2010 09:25:23 +0000
-Subject: [PATCH 01/30] BZ-597066
+Subject: [PATCH 01/34] BZ-597066
Don't use guest/guest default username/password, use None instead (this allows sasl implementation to infer the correct choice while retaining the ability to override it should that be desired)
diff --git a/0002-Bug-538188-Fixed-connection.start-hangs-if-connectio.patch b/0002-Bug-538188-Fixed-connection.start-hangs-if-connectio.patch
index 4fe087c..1846995 100644
--- a/0002-Bug-538188-Fixed-connection.start-hangs-if-connectio.patch
+++ b/0002-Bug-538188-Fixed-connection.start-hangs-if-connectio.patch
@@ -1,7 +1,7 @@
From 9e7d9497b8665b51075ddcfd1d01d805f009f78b Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim at apache.org>
Date: Wed, 2 Jun 2010 10:24:10 +0000
-Subject: [PATCH 02/30] Bug 538188 - Fixed connection.start() hangs if connection is not accepted
+Subject: [PATCH 02/34] Bug 538188 - Fixed connection.start() hangs if connection is not accepted
QPID-2637: Mark connection as failed if read from socket fails
diff --git a/0003-Bug-597149-Fixed-qpid-python-high-level-API-clients-.patch b/0003-Bug-597149-Fixed-qpid-python-high-level-API-clients-.patch
index a9044d4..24e9f29 100644
--- a/0003-Bug-597149-Fixed-qpid-python-high-level-API-clients-.patch
+++ b/0003-Bug-597149-Fixed-qpid-python-high-level-API-clients-.patch
@@ -1,7 +1,7 @@
From 4ee966781844a3757eaa44ebf4690105c2f18850 Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim at apache.org>
Date: Wed, 9 Jun 2010 15:37:02 +0000
-Subject: [PATCH 03/30] Bug 597149 - Fixed - qpid python high level API clients not runnable on RHEL4 incompatible with python 2.3.4 OptionParser
+Subject: [PATCH 03/34] Bug 597149 - Fixed - qpid python high level API clients not runnable on RHEL4 incompatible with python 2.3.4 OptionParser
Minor adjustment to option definitions for Python 2.3
diff --git a/0004-BZ-567249-added-back-values-method-for-backwards-com.patch b/0004-BZ-567249-added-back-values-method-for-backwards-com.patch
index 64843c6..9aa5c9d 100644
--- a/0004-BZ-567249-added-back-values-method-for-backwards-com.patch
+++ b/0004-BZ-567249-added-back-values-method-for-backwards-com.patch
@@ -1,7 +1,7 @@
From 38ce79eee4d48e2be75c6d74ded2c383fba5810c Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 15 Jun 2010 10:11:39 +0000
-Subject: [PATCH 04/30] BZ-567249 added back values method for backwards compatibility
+Subject: [PATCH 04/34] BZ-567249 added back values method for backwards compatibility
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@954787 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0005-BZ-567249-fix-for-python-2.3.patch b/0005-BZ-567249-fix-for-python-2.3.patch
index 3b5126e..bea00af 100644
--- a/0005-BZ-567249-fix-for-python-2.3.patch
+++ b/0005-BZ-567249-fix-for-python-2.3.patch
@@ -1,7 +1,7 @@
From 4e05457ddfe178ac4cfa55bb1dcd6986c272e500 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 15 Jun 2010 14:13:15 +0000
-Subject: [PATCH 05/30] BZ-567249 fix for python 2.3
+Subject: [PATCH 05/34] BZ-567249 fix for python 2.3
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@954901 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0006-BZ-596677-performance-tweaks-for-receive-added-confi.patch b/0006-BZ-596677-performance-tweaks-for-receive-added-confi.patch
index e1b9fca..28b95d3 100644
--- a/0006-BZ-596677-performance-tweaks-for-receive-added-confi.patch
+++ b/0006-BZ-596677-performance-tweaks-for-receive-added-confi.patch
@@ -1,7 +1,7 @@
From b0ae853c18fad859d5e7daabcb0598ab2d197ea6 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 16 Jun 2010 16:47:18 +0000
-Subject: [PATCH 06/30] BZ-596677 performance tweaks for receive: added configurable threshold for issuing credit; don't disable byte credit more than necessary; avoided n-squared loop for generating acks
+Subject: [PATCH 06/34] BZ-596677 performance tweaks for receive: added configurable threshold for issuing credit; don't disable byte credit more than necessary; avoided n-squared loop for generating acks
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@955296 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0007-BZ-574817-don-t-always-set-the-sync-bit-on-send.patch b/0007-BZ-574817-don-t-always-set-the-sync-bit-on-send.patch
index 843d5f3..4ffbbd8 100644
--- a/0007-BZ-574817-don-t-always-set-the-sync-bit-on-send.patch
+++ b/0007-BZ-574817-don-t-always-set-the-sync-bit-on-send.patch
@@ -1,7 +1,7 @@
From e1c3a645453c2796b67625a1e00341894777f223 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 16 Jun 2010 22:15:14 +0000
-Subject: [PATCH 07/30] BZ-574817 don't always set the sync bit on send
+Subject: [PATCH 07/34] BZ-574817 don't always set the sync bit on send
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@955414 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0008-BZ-604836-reset-reconnect-delay-after-successful-con.patch b/0008-BZ-604836-reset-reconnect-delay-after-successful-con.patch
index 712d96e..e8711dd 100644
--- a/0008-BZ-604836-reset-reconnect-delay-after-successful-con.patch
+++ b/0008-BZ-604836-reset-reconnect-delay-after-successful-con.patch
@@ -1,7 +1,7 @@
From df73fc4c6a53f8b266fb88af60ea68df03057668 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Thu, 17 Jun 2010 02:18:24 +0000
-Subject: [PATCH 08/30] BZ-604836 reset reconnect delay after successful connect
+Subject: [PATCH 08/34] BZ-604836 reset reconnect delay after successful connect
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@955462 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0009-BZ-560707-added-full-support-for-unreliable-at-least.patch b/0009-BZ-560707-added-full-support-for-unreliable-at-least.patch
index 764698e..f2307ce 100644
--- a/0009-BZ-560707-added-full-support-for-unreliable-at-least.patch
+++ b/0009-BZ-560707-added-full-support-for-unreliable-at-least.patch
@@ -1,7 +1,7 @@
From 3f3e6086766770c3d7e1a7cf9afdfaedce82dd18 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Thu, 24 Jun 2010 17:34:34 +0000
-Subject: [PATCH 09/30] BZ-560707 added full support for unreliable, at-least-once, and at-most-once reliability options
+Subject: [PATCH 09/34] BZ-560707 added full support for unreliable, at-least-once, and at-most-once reliability options
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@957644 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0010-BZ-569515-added-optional-timeouts-to-connection-sess.patch b/0010-BZ-569515-added-optional-timeouts-to-connection-sess.patch
index 0360dad..fcf8600 100644
--- a/0010-BZ-569515-added-optional-timeouts-to-connection-sess.patch
+++ b/0010-BZ-569515-added-optional-timeouts-to-connection-sess.patch
@@ -1,7 +1,7 @@
From 495213b8cc66dc00c15662c559a48dcf04516fd7 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 17:09:05 +0000
-Subject: [PATCH 10/30] BZ-569515 added optional timeouts to {connection,session,sender,receiver}.close() as well as connection.detach() and {session,sender}.sync()
+Subject: [PATCH 10/34] BZ-569515 added optional timeouts to {connection,session,sender,receiver}.close() as well as connection.detach() and {session,sender}.sync()
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958037 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0011-BZ-608118-added-support-for-x-amqp-0-10.-app-id-cont.patch b/0011-BZ-608118-added-support-for-x-amqp-0-10.-app-id-cont.patch
index 558f730..1377ac6 100644
--- a/0011-BZ-608118-added-support-for-x-amqp-0-10.-app-id-cont.patch
+++ b/0011-BZ-608118-added-support-for-x-amqp-0-10.-app-id-cont.patch
@@ -1,7 +1,7 @@
From 9201b99100d8d47b3ed92573eea0e71969996418 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 18:12:28 +0000
-Subject: [PATCH 11/30] BZ-608118 added support for x-amqp-0-10.{app-id,content-encoding,routing-key}
+Subject: [PATCH 11/34] BZ-608118 added support for x-amqp-0-10.{app-id,content-encoding,routing-key}
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958055 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0012-BZ-608118-make-sure-we-initialize-properties-even-if.patch b/0012-BZ-608118-make-sure-we-initialize-properties-even-if.patch
index 5a0366f..9593052 100644
--- a/0012-BZ-608118-make-sure-we-initialize-properties-even-if.patch
+++ b/0012-BZ-608118-make-sure-we-initialize-properties-even-if.patch
@@ -1,7 +1,7 @@
From d5086ed9cd510ce9f1dc80da90315518d5c3ebd2 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 18:26:14 +0000
-Subject: [PATCH 12/30] BZ-608118 make sure we initialize properties even if application_headers is None
+Subject: [PATCH 12/34] BZ-608118 make sure we initialize properties even if application_headers is None
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958060 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0013-BZ-569515-fix-timeout-tests-to-not-leave-queues-lyin.patch b/0013-BZ-569515-fix-timeout-tests-to-not-leave-queues-lyin.patch
index 8c461f2..58743f0 100644
--- a/0013-BZ-569515-fix-timeout-tests-to-not-leave-queues-lyin.patch
+++ b/0013-BZ-569515-fix-timeout-tests-to-not-leave-queues-lyin.patch
@@ -1,7 +1,7 @@
From ee19a4688911a9fc55dea5f3176e99d6b77acafe Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 18:57:59 +0000
-Subject: [PATCH 13/30] BZ-569515 fix timeout tests to not leave queues lying around
+Subject: [PATCH 13/34] BZ-569515 fix timeout tests to not leave queues lying around
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958077 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0014-BZ-607798-add-uuid-prefix-to-addresses-beginning-wit.patch b/0014-BZ-607798-add-uuid-prefix-to-addresses-beginning-wit.patch
index 2d78bc9..e5ec171 100644
--- a/0014-BZ-607798-add-uuid-prefix-to-addresses-beginning-wit.patch
+++ b/0014-BZ-607798-add-uuid-prefix-to-addresses-beginning-wit.patch
@@ -1,7 +1,7 @@
From 1834e02e7dd0abd92d4bee09818f86f4fb6af89b Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 19:06:05 +0000
-Subject: [PATCH 14/30] BZ-607798 add uuid prefix to addresses beginning with hash(#)
+Subject: [PATCH 14/34] BZ-607798 add uuid prefix to addresses beginning with hash(#)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958083 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0015-BZ-607798-fix-mangling-for-addresses-that-are-None.patch b/0015-BZ-607798-fix-mangling-for-addresses-that-are-None.patch
index c8af553..3726713 100644
--- a/0015-BZ-607798-fix-mangling-for-addresses-that-are-None.patch
+++ b/0015-BZ-607798-fix-mangling-for-addresses-that-are-None.patch
@@ -1,7 +1,7 @@
From dcc6c20a11f1dffac6708a128517757e7b1e0324 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Mon, 28 Jun 2010 11:35:59 +0000
-Subject: [PATCH 15/30] BZ-607798 fix mangling for addresses that are None
+Subject: [PATCH 15/34] BZ-607798 fix mangling for addresses that are None
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958547 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0016-BZ-608807-fixed-concurrent-close.patch b/0016-BZ-608807-fixed-concurrent-close.patch
index d2bdd3f..d37bb91 100644
--- a/0016-BZ-608807-fixed-concurrent-close.patch
+++ b/0016-BZ-608807-fixed-concurrent-close.patch
@@ -1,7 +1,7 @@
From 62d79016f13c729abccba7a84d1dbb33ec94d9d5 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 30 Jun 2010 12:44:58 +0000
-Subject: [PATCH 16/30] BZ-608807 fixed concurrent close
+Subject: [PATCH 16/34] BZ-608807 fixed concurrent close
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@959289 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0017-BZ-609258-added-accessor-for-auth_username.patch b/0017-BZ-609258-added-accessor-for-auth_username.patch
index 681626c..1388ae5 100644
--- a/0017-BZ-609258-added-accessor-for-auth_username.patch
+++ b/0017-BZ-609258-added-accessor-for-auth_username.patch
@@ -1,7 +1,7 @@
From d31918432748c8e6f3596548796fb45bf778b20e Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 30 Jun 2010 14:25:03 +0000
-Subject: [PATCH 17/30] BZ-609258 added accessor for auth_username
+Subject: [PATCH 17/34] BZ-609258 added accessor for auth_username
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@959326 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0018-BZ-609258-fixed-auth-username-for-sasl.patch b/0018-BZ-609258-fixed-auth-username-for-sasl.patch
index 67cd9d5..1641493 100644
--- a/0018-BZ-609258-fixed-auth-username-for-sasl.patch
+++ b/0018-BZ-609258-fixed-auth-username-for-sasl.patch
@@ -1,7 +1,7 @@
From 5c3a50f97f327161fd5bd991c8ef4a8b6aece62a Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 30 Jun 2010 14:36:43 +0000
-Subject: [PATCH 18/30] BZ-609258 fixed auth username for sasl
+Subject: [PATCH 18/34] BZ-609258 fixed auth username for sasl
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@959333 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0019-Bug-611543-Assertion-when-raising-a-link-established.patch b/0019-Bug-611543-Assertion-when-raising-a-link-established.patch
index 5c7c3b9..b4ac2e5 100644
--- a/0019-Bug-611543-Assertion-when-raising-a-link-established.patch
+++ b/0019-Bug-611543-Assertion-when-raising-a-link-established.patch
@@ -1,7 +1,7 @@
From ba83c5fd4c4cccae42240c70473d8d37fd8d3fcb Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway at apache.org>
Date: Mon, 5 Jul 2010 20:12:08 +0000
-Subject: [PATCH 19/30] Bug 611543 - Assertion when raising a link established event on clustered broker
+Subject: [PATCH 19/34] Bug 611543 - Assertion when raising a link established event on clustered broker
Defer delivery of messages in cluster-unsafe context.
diff --git a/0020-BZ-612615-convert-ttl-from-seconds-to-milliseconds.patch b/0020-BZ-612615-convert-ttl-from-seconds-to-milliseconds.patch
index 449e88f..4fb485d 100644
--- a/0020-BZ-612615-convert-ttl-from-seconds-to-milliseconds.patch
+++ b/0020-BZ-612615-convert-ttl-from-seconds-to-milliseconds.patch
@@ -1,7 +1,7 @@
From a0e4c21893973aea53b773381ee6ca2c7e6dbcb2 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Thu, 8 Jul 2010 15:53:49 +0000
-Subject: [PATCH 20/30] BZ-612615 convert ttl from seconds to milliseconds
+Subject: [PATCH 20/34] BZ-612615 convert ttl from seconds to milliseconds
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@961824 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0021-BZ-613216-fixed-payload-of-None-for-text-plain-messa.patch b/0021-BZ-613216-fixed-payload-of-None-for-text-plain-messa.patch
index b5c25a6..c003b09 100644
--- a/0021-BZ-613216-fixed-payload-of-None-for-text-plain-messa.patch
+++ b/0021-BZ-613216-fixed-payload-of-None-for-text-plain-messa.patch
@@ -1,7 +1,7 @@
From ee2dcac6734efed72b2379cf22437799e8f39efc Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Mon, 12 Jul 2010 13:43:27 +0000
-Subject: [PATCH 21/30] BZ-613216 fixed payload of None for text/plain messages
+Subject: [PATCH 21/34] BZ-613216 fixed payload of None for text/plain messages
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963280 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0022-removed-old-python-examples.patch b/0022-removed-old-python-examples.patch
index 8283692..e074058 100644
--- a/0022-removed-old-python-examples.patch
+++ b/0022-removed-old-python-examples.patch
@@ -1,7 +1,7 @@
From 3d0eebd14b24321d5c91662c873c1b689c360150 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 13 Jul 2010 16:33:24 +0000
-Subject: [PATCH 22/30] removed old python examples
+Subject: [PATCH 22/34] removed old python examples
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963786 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0023-BZ-613912-fixed-missign-import-and-added-test-case-f.patch b/0023-BZ-613912-fixed-missign-import-and-added-test-case-f.patch
index 551af1a..84d1455 100644
--- a/0023-BZ-613912-fixed-missign-import-and-added-test-case-f.patch
+++ b/0023-BZ-613912-fixed-missign-import-and-added-test-case-f.patch
@@ -1,7 +1,7 @@
From dee1c0cebff68b694ed6e80be79b8943ebb40574 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 13 Jul 2010 17:58:44 +0000
-Subject: [PATCH 23/30] BZ-613912 fixed missign import and added test case for reconnect_urls
+Subject: [PATCH 23/34] BZ-613912 fixed missign import and added test case for reconnect_urls
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963803 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0024-BZ-614054-eliminate-spurious-error-logging-and-recon.patch b/0024-BZ-614054-eliminate-spurious-error-logging-and-recon.patch
index fc93c52..9872d7c 100644
--- a/0024-BZ-614054-eliminate-spurious-error-logging-and-recon.patch
+++ b/0024-BZ-614054-eliminate-spurious-error-logging-and-recon.patch
@@ -1,7 +1,7 @@
From 69472698c9455b198d70e7b61ae2f1f06a8ff783 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 13 Jul 2010 19:07:22 +0000
-Subject: [PATCH 24/30] BZ-614054 eliminate spurious error logging and reconnect attempts
+Subject: [PATCH 24/34] BZ-614054 eliminate spurious error logging and reconnect attempts
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963825 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0025-BZ-614054-fixed-parsing-of-failover-URLs-fixed-drive.patch b/0025-BZ-614054-fixed-parsing-of-failover-URLs-fixed-drive.patch
index ec85913..42e2ea9 100644
--- a/0025-BZ-614054-fixed-parsing-of-failover-URLs-fixed-drive.patch
+++ b/0025-BZ-614054-fixed-parsing-of-failover-URLs-fixed-drive.patch
@@ -1,7 +1,7 @@
From 5387d39d66787509b3d687be7247dcf8a2d4b207 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 14 Jul 2010 13:36:03 +0000
-Subject: [PATCH 25/30] BZ-614054 fixed parsing of failover URLs; fixed driver to notice when reconnect_urls is dynamically changed
+Subject: [PATCH 25/34] BZ-614054 fixed parsing of failover URLs; fixed driver to notice when reconnect_urls is dynamically changed
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@964044 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0026-BZ-614344-default-ports-for-reconnect_urls.patch b/0026-BZ-614344-default-ports-for-reconnect_urls.patch
index 0ea34cc..5eadc33 100644
--- a/0026-BZ-614344-default-ports-for-reconnect_urls.patch
+++ b/0026-BZ-614344-default-ports-for-reconnect_urls.patch
@@ -1,7 +1,7 @@
From 0e2870b1d18706721055ddf73fc4e7a6b84cf674 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 14 Jul 2010 19:47:37 +0000
-Subject: [PATCH 26/30] BZ-614344 default ports for reconnect_urls
+Subject: [PATCH 26/34] BZ-614344 default ports for reconnect_urls
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@964151 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch b/0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch
index e387110..e9fbe04 100644
--- a/0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch
+++ b/0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch
@@ -1,7 +1,7 @@
From 98d60f067c05a308f82b23fcdfa87494d783daa1 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Mon, 2 Aug 2010 12:10:52 +0000
-Subject: [PATCH 27/30] BZ-620402 fixed bug in flow control logic; added tests
+Subject: [PATCH 27/34] BZ-620402 fixed bug in flow control logic; added tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@981474 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0028-BZ-621998-fixed-heartbeating.patch b/0028-BZ-621998-fixed-heartbeating.patch
index 105b90d..2d82862 100644
--- a/0028-BZ-621998-fixed-heartbeating.patch
+++ b/0028-BZ-621998-fixed-heartbeating.patch
@@ -1,7 +1,7 @@
From e81d614bcfe0227d41f57e6f0ea2156bf057ca11 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Mon, 9 Aug 2010 11:53:25 +0000
-Subject: [PATCH 28/30] BZ-621998 fixed heartbeating
+Subject: [PATCH 28/34] BZ-621998 fixed heartbeating
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@983597 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/0029-Changed-conditional-assignment-to-vanilla-if-then-el.patch b/0029-Changed-conditional-assignment-to-vanilla-if-then-el.patch
index 1e614ed..daf3713 100644
--- a/0029-Changed-conditional-assignment-to-vanilla-if-then-el.patch
+++ b/0029-Changed-conditional-assignment-to-vanilla-if-then-el.patch
@@ -1,7 +1,7 @@
From 688688c265d541a47aade8f4290af064a47ef286 Mon Sep 17 00:00:00 2001
From: Jonathan Robie <jonathan at apache.org>
Date: Mon, 9 Aug 2010 16:34:04 +0000
-Subject: [PATCH 29/30] Changed conditional assignment to vanilla if/then/else, for compatibility with older Python.
+Subject: [PATCH 29/34] Changed conditional assignment to vanilla if/then/else, for compatibility with older Python.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@983718 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 4b67ae91be27048aca8ded77b1089dd0487eff03)
diff --git a/0030-Removed-finally-Python-before-2.5-did-not-allow-fina.patch b/0030-Removed-finally-Python-before-2.5-did-not-allow-fina.patch
index 94b2bc2..a482c5f 100644
--- a/0030-Removed-finally-Python-before-2.5-did-not-allow-fina.patch
+++ b/0030-Removed-finally-Python-before-2.5-did-not-allow-fina.patch
@@ -1,7 +1,7 @@
From 1ca7496b9db44598aabf63c729e8dde926805a81 Mon Sep 17 00:00:00 2001
From: Jonathan Robie <jonathan at apache.org>
Date: Mon, 9 Aug 2010 17:31:40 +0000
-Subject: [PATCH 30/30] Removed finally - Python before 2.5 did not allow finally together with specific exceptions.
+Subject: [PATCH 30/34] Removed finally - Python before 2.5 did not allow finally together with specific exceptions.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@983743 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit e3bc2893e6a3fae16079ba7bdcb034f3026fee76)
diff --git a/0031-Bug-622699-ManagementTest.test_broker_connectivity_o.patch b/0031-Bug-622699-ManagementTest.test_broker_connectivity_o.patch
new file mode 100644
index 0000000..dcd40ce
--- /dev/null
+++ b/0031-Bug-622699-ManagementTest.test_broker_connectivity_o.patch
@@ -0,0 +1,59 @@
+From 43af3b6d4ea16c8ecb3f9f954613b2785c5393b3 Mon Sep 17 00:00:00 2001
+From: Kenneth Anthony Giusti <kgiusti at apache.org>
+Date: Wed, 11 Aug 2010 14:46:39 +0000
+Subject: [PATCH 31/34] Bug 622699 - ManagementTest.test_broker_connectivity_oldAPI fails against standalone broker
+
+Correctly parse replies containing multiple qmf messages.
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@984424 13f79535-47bb-0310-9956-ffa450edef68
+(cherry picked from commit 854f438dd72b62fddb58a15a90a0731c92b8cb5e)
+---
+ qpid/python/qpid/management.py | 33 +++++++++++++++++----------------
+ 1 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/qpid/python/qpid/management.py b/qpid/python/qpid/management.py
+index a23932a..3de8da9 100644
+--- a/qpid/python/qpid/management.py
++++ b/qpid/python/qpid/management.py
+@@ -376,22 +376,23 @@ class managementClient:
+ def replyCb (self, ch, msg):
+ """ Receive messages via the reply queue of a particular channel. """
+ codec = Codec (msg.body)
+- hdr = self.checkHeader (codec)
+- if hdr == None:
+- return
++ while True:
++ hdr = self.checkHeader (codec)
++ if hdr == None:
++ return
+
+- if hdr[0] == 'm':
+- self.handleMethodReply (ch, codec, hdr[1])
+- elif hdr[0] == 'z':
+- self.handleCommandComplete (ch, codec, hdr[1])
+- elif hdr[0] == 'b':
+- self.handleBrokerResponse (ch, codec)
+- elif hdr[0] == 'p':
+- self.handlePackageInd (ch, codec)
+- elif hdr[0] == 'q':
+- self.handleClassInd (ch, codec)
+- else:
+- self.parse (ch, codec, hdr[0], hdr[1])
++ if hdr[0] == 'm':
++ self.handleMethodReply (ch, codec, hdr[1])
++ elif hdr[0] == 'z':
++ self.handleCommandComplete (ch, codec, hdr[1])
++ elif hdr[0] == 'b':
++ self.handleBrokerResponse (ch, codec)
++ elif hdr[0] == 'p':
++ self.handlePackageInd (ch, codec)
++ elif hdr[0] == 'q':
++ self.handleClassInd (ch, codec)
++ else:
++ self.parse (ch, codec, hdr[0], hdr[1])
+
+ def exceptCb (self, ch, data):
+ if self.closeCb != None:
+--
+1.7.2
+
diff --git a/0032-BZ-621527-default-sasl-service-to-qpidd.patch b/0032-BZ-621527-default-sasl-service-to-qpidd.patch
new file mode 100644
index 0000000..f062ce2
--- /dev/null
+++ b/0032-BZ-621527-default-sasl-service-to-qpidd.patch
@@ -0,0 +1,27 @@
+From b1df1af4be83cc7606c115d9f330c4f9512a73eb Mon Sep 17 00:00:00 2001
+From: Rafael H. Schloming <rhs at apache.org>
+Date: Wed, 11 Aug 2010 11:41:59 +0000
+Subject: [PATCH 32/34] BZ-621527 default sasl service to qpidd
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@984382 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/python/qpid/delegates.py | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/qpid/python/qpid/delegates.py b/qpid/python/qpid/delegates.py
+index 5c1c8ad..8dbdc37 100644
+--- a/qpid/python/qpid/delegates.py
++++ b/qpid/python/qpid/delegates.py
+@@ -177,8 +177,7 @@ class Client(Delegate):
+ self.sasl.setAttr("username", str(username))
+ if password and len(password) > 0:
+ self.sasl.setAttr("password", str(password))
+- if "service" in kwargs:
+- self.sasl.setAttr("service", str(kwargs["service"]))
++ self.sasl.setAttr("service", str(kwargs.get("service", "qpidd")))
+ if "host" in kwargs:
+ self.sasl.setAttr("host", str(kwargs["host"]))
+ if "min_ssf" in kwargs:
+--
+1.7.2
+
diff --git a/0033-BZ-624715-fix-error-reporting-for-negotiation-failur.patch b/0033-BZ-624715-fix-error-reporting-for-negotiation-failur.patch
new file mode 100644
index 0000000..a912a51
--- /dev/null
+++ b/0033-BZ-624715-fix-error-reporting-for-negotiation-failur.patch
@@ -0,0 +1,43 @@
+From 7f9f37995e204bee922195faf937b570a3c5beae Mon Sep 17 00:00:00 2001
+From: Rafael H. Schloming <rhs at apache.org>
+Date: Wed, 11 Aug 2010 11:58:49 +0000
+Subject: [PATCH 33/34] BZ-624715 fix error reporting for negotiation failure in sasl stub
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@984386 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/python/qpid/messaging/driver.py | 5 ++++-
+ qpid/python/qpid/sasl.py | 2 ++
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/qpid/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
+index 567871b..30cc2eb 100644
+--- a/qpid/python/qpid/messaging/driver.py
++++ b/qpid/python/qpid/messaging/driver.py
+@@ -691,7 +691,10 @@ class Engine:
+ mechs = [m for m in start.mechanisms if m in permitted]
+ else:
+ mechs = start.mechanisms
+- mech, initial = self._sasl.start(" ".join(mechs))
++ try:
++ mech, initial = self._sasl.start(" ".join(mechs))
++ except sasl.SASLError, e:
++ raise AuthenticationFailure(text=str(e))
+ self.write_op(ConnectionStartOk(client_properties=CLIENT_PROPERTIES,
+ mechanism=mech, response=initial))
+
+diff --git a/qpid/python/qpid/sasl.py b/qpid/python/qpid/sasl.py
+index d4c15bd..fed6dea 100644
+--- a/qpid/python/qpid/sasl.py
++++ b/qpid/python/qpid/sasl.py
+@@ -89,6 +89,8 @@ class PlainClient:
+ return "PLAIN", "\0%s\0%s" % (self.attrs.get("username"), self.attrs.get("password"))
+ elif "ANONYMOUS" in mechs:
+ return "ANONYMOUS", "%s@%s" % (self.attrs.get("username"), socket.gethostname())
++ else:
++ raise SASLError("sasl negotiation failed: no mechanism agreed")
+
+ def step(self, challenge):
+ pass
+--
+1.7.2
+
diff --git a/0034-BZ-624714-fixed-reply-to-conversion.patch b/0034-BZ-624714-fixed-reply-to-conversion.patch
new file mode 100644
index 0000000..ed35a24
--- /dev/null
+++ b/0034-BZ-624714-fixed-reply-to-conversion.patch
@@ -0,0 +1,79 @@
+From 7e105a4f445dae7d506d12a135789d08854c3d30 Mon Sep 17 00:00:00 2001
+From: Rafael H. Schloming <rhs at apache.org>
+Date: Thu, 12 Aug 2010 18:37:19 +0000
+Subject: [PATCH 34/34] BZ-624714 fixed reply-to conversion
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@984906 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/python/qpid/messaging/driver.py | 18 +++++++++++++-----
+ qpid/python/qpid/tests/messaging/message.py | 24 ++++++++++++++++++++++++
+ 2 files changed, 37 insertions(+), 5 deletions(-)
+
+diff --git a/qpid/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
+index 30cc2eb..0c7c7e7 100644
+--- a/qpid/python/qpid/messaging/driver.py
++++ b/qpid/python/qpid/messaging/driver.py
+@@ -41,15 +41,23 @@ opslog = getLogger("qpid.messaging.io.ops")
+
+ def addr2reply_to(addr):
+ name, subject, options = address.parse(addr)
+- return ReplyTo(name, subject)
++ if options:
++ type = options.get("node", {}).get("type")
++ else:
++ type = None
++
++ if type == "topic":
++ return ReplyTo(name, subject)
++ else:
++ return ReplyTo(None, name)
+
+ def reply_to2addr(reply_to):
+- if reply_to.routing_key is None:
+- return reply_to.exchange
+- elif reply_to.exchange in (None, ""):
++ if reply_to.exchange in (None, ""):
+ return reply_to.routing_key
++ elif reply_to.routing_key is None:
++ return "%s; {node: {type: topic}}" % reply_to.exchange
+ else:
+- return "%s/%s" % (reply_to.exchange, reply_to.routing_key)
++ return "%s/%s; {node: {type: topic}}" % (reply_to.exchange, reply_to.routing_key)
+
+ class Attachment:
+
+diff --git a/qpid/python/qpid/tests/messaging/message.py b/qpid/python/qpid/tests/messaging/message.py
+index 526a5cf..eaa953e 100644
+--- a/qpid/python/qpid/tests/messaging/message.py
++++ b/qpid/python/qpid/tests/messaging/message.py
+@@ -117,3 +117,27 @@ class MessageEchoTests(Base):
+
+ def testTextPlainEmpty(self):
+ self.check(Message(content_type="text/plain"))
++
++ def check_rt(self, addr, expected=None):
++ if expected is None:
++ expected = addr
++ msg = Message(reply_to=addr)
++ self.snd.send(msg)
++ echo = self.rcv.fetch(0)
++ assert echo.reply_to == expected, echo.reply_to
++ self.ssn.acknowledge(echo)
++
++ def testReplyTo(self):
++ self.check_rt("name")
++
++ def testReplyToQueue(self):
++ self.check_rt("name; {node: {type: queue}}", "name")
++
++ def testReplyToQueueSubject(self):
++ self.check_rt("name/subject; {node: {type: queue}}", "name")
++
++ def testReplyToTopic(self):
++ self.check_rt("name; {node: {type: topic}}")
++
++ def testReplyToTopicSubject(self):
++ self.check_rt("name/subject; {node: {type: topic}}")
+--
+1.7.2
+
diff --git a/python-qpid.spec b/python-qpid.spec
index b5c0cf8..66b6812 100644
--- a/python-qpid.spec
+++ b/python-qpid.spec
@@ -3,7 +3,7 @@
Name: python-qpid
Version: 0.7.946106
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Python client library for AMQP
Group: Development/Python
@@ -43,6 +43,11 @@ Patch26: 0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch
Patch27: 0028-BZ-621998-fixed-heartbeating.patch
Patch28: 0029-Changed-conditional-assignment-to-vanilla-if-then-el.patch
Patch29: 0030-Removed-finally-Python-before-2.5-did-not-allow-fina.patch
+Patch30: 0031-Bug-622699-ManagementTest.test_broker_connectivity_o.patch
+Patch31: 0032-BZ-621527-default-sasl-service-to-qpidd.patch
+Patch32: 0033-BZ-624715-fix-error-reporting-for-negotiation-failur.patch
+Patch33: 0034-BZ-624714-fixed-reply-to-conversion.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -84,6 +89,10 @@ The Apache Qpid Python client library for AMQP.
%patch27 -p3
%patch28 -p3
%patch29 -p3
+%patch30 -p3
+%patch31 -p3
+%patch32 -p3
+%patch33 -p3
%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -107,6 +116,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Aug 17 2010 Rafael Schloming <rafaels at redhat.com> - 0.7.946106-13
+- Fix for bz622699
+- Fix for bz621527
+- Fix for bz624715
+- Fix for bz624714
+
* Mon Aug 2 2010 Rafael Schloming <rafaels at redhat.com> - 0.7.946106-12
- Fixes to examples for compatibility with older python versions
- Fix for bz621998
More information about the scm-commits
mailing list