qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject qpid-proton git commit: Fix to PROTON-963: Don't hang if Cyrus SASL detects "no worthy mech"
Date Tue, 04 Aug 2015 06:15:26 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 9d1604984 -> 7f9be5c3b


Fix to PROTON-963: Don't hang if Cyrus SASL detects "no worthy mech"


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/7f9be5c3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/7f9be5c3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/7f9be5c3

Branch: refs/heads/master
Commit: 7f9be5c3bf009cbb14b1147a24233bb579e30e95
Parents: 9d16049
Author: Andrew Stitcher <astitcher@apache.org>
Authored: Tue Aug 4 02:11:04 2015 -0400
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Tue Aug 4 02:11:04 2015 -0400

----------------------------------------------------------------------
 proton-c/src/sasl/sasl.c          |  2 +-
 tests/python/proton_tests/sasl.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7f9be5c3/proton-c/src/sasl/sasl.c
----------------------------------------------------------------------
diff --git a/proton-c/src/sasl/sasl.c b/proton-c/src/sasl/sasl.c
index 7535306..a01cce5 100644
--- a/proton-c/src/sasl/sasl.c
+++ b/proton-c/src/sasl/sasl.c
@@ -688,7 +688,7 @@ int pn_do_mechanisms(pn_transport_t *transport, uint8_t frame_type, uint16_t
cha
     pni_sasl_set_desired_state(transport, SASL_POSTED_INIT);
   } else {
     sasl->outcome = PN_SASL_PERM;
-    pni_sasl_set_desired_state(transport, SASL_ERROR);
+    pni_sasl_set_desired_state(transport, SASL_RECVED_OUTCOME);
   }
 
   pn_free(mechs);

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7f9be5c3/tests/python/proton_tests/sasl.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/sasl.py b/tests/python/proton_tests/sasl.py
index 248900c..df2910a 100644
--- a/tests/python/proton_tests/sasl.py
+++ b/tests/python/proton_tests/sasl.py
@@ -542,8 +542,8 @@ class SASLEventTest(engine.CollectorTest):
     _testSaslMech(self, 'DIGEST-MD5', authenticated=False)
     self.expect(Event.CONNECTION_INIT, Event.CONNECTION_BOUND,
                 Event.CONNECTION_LOCAL_OPEN, Event.TRANSPORT,
-                Event.TRANSPORT_HEAD_CLOSED, Event.TRANSPORT_TAIL_CLOSED, Event.TRANSPORT_CLOSED,
-                Event.TRANSPORT_ERROR)
+                Event.TRANSPORT_ERROR,
+                Event.TRANSPORT_TAIL_CLOSED, Event.TRANSPORT_HEAD_CLOSED, Event.TRANSPORT_CLOSED)
 
   def testNoMechServer(self):
     common.ensureCanTestExtendedSASL()
@@ -564,8 +564,8 @@ class SASLEventTest(engine.CollectorTest):
     _testSaslMech(self, 'IMPOSSIBLE', authenticated=False)
     self.expect(Event.CONNECTION_INIT, Event.CONNECTION_BOUND,
                 Event.CONNECTION_LOCAL_OPEN, Event.TRANSPORT,
-                Event.TRANSPORT_HEAD_CLOSED, Event.TRANSPORT_TAIL_CLOSED, Event.TRANSPORT_CLOSED,
-                Event.TRANSPORT_ERROR)
+                Event.TRANSPORT_ERROR,
+                Event.TRANSPORT_TAIL_CLOSED, Event.TRANSPORT_HEAD_CLOSED, Event.TRANSPORT_CLOSED)
 
   def testDisallowedMechServer(self):
     self.c2.collect(self.collector)
@@ -584,8 +584,8 @@ class SASLEventTest(engine.CollectorTest):
     _testSaslMech(self, 'PLAIN', authenticated=False)
     self.expect(Event.CONNECTION_INIT, Event.CONNECTION_BOUND,
                 Event.CONNECTION_LOCAL_OPEN, Event.TRANSPORT,
-                Event.TRANSPORT_HEAD_CLOSED, Event.TRANSPORT_TAIL_CLOSED, Event.TRANSPORT_CLOSED,
-                Event.TRANSPORT_ERROR)
+                Event.TRANSPORT_ERROR,
+                Event.TRANSPORT_TAIL_CLOSED, Event.TRANSPORT_HEAD_CLOSED, Event.TRANSPORT_CLOSED)
 
   def testDisallowedPlainServer(self):
     self.c2.collect(self.collector)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message