Author: rhs
Date: Mon Nov 5 10:57:24 2012
New Revision: 1405744
URL: http://svn.apache.org/viewvc?rev=1405744&view=rev
Log:
fixed bug where engine requires a second call to output in order to produce
bytes
Modified:
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/tests/proton_tests/sasl.py
Modified: qpid/proton/trunk/proton-c/src/engine/engine.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine.c?rev=1405744&r1=1405743&r2=1405744&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Mon Nov 5 10:57:24 2012
@@ -2369,7 +2369,7 @@ static ssize_t pn_output_write_sasl(pn_t
ssize_t n = pn_sasl_output(sasl, bytes, size);
if (n == PN_EOS) {
transport->process_output = pn_output_write_amqp_header;
- return 0;
+ return transport->process_output(transport, bytes, size);
} else {
return n;
}
Modified: qpid/proton/trunk/tests/proton_tests/sasl.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/sasl.py?rev=1405744&r1=1405743&r2=1405744&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/sasl.py (original)
+++ qpid/proton/trunk/tests/proton_tests/sasl.py Mon Nov 5 10:57:24 2012
@@ -84,3 +84,25 @@ class SaslTest(Test):
self.s1.plain("secundus", "trustno1")
self.pump()
assert self.s2.recv() == "\x00secundus\x00trustno1"
+
+ def testPipelined2(self):
+ self.s1.mechanisms("ANONYMOUS")
+ self.s1.client()
+
+ out1 = self.t1.output(1024)
+ n = self.t2.input(out1)
+ assert n == len(out1)
+
+ self.s2.mechanisms("ANONYMOUS")
+ self.s2.server()
+ self.s2.done(SASL.OK)
+ c2 = Connection()
+ c2.open()
+ self.t2.bind(c2)
+
+ out2 = self.t2.output(1024)
+ n = self.t1.input(out2)
+ assert n == len(out2)
+
+ out1 = self.t1.output(1024)
+ assert len(out1) > 0
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
