You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2012/08/27 21:21:25 UTC
svn commit: r1377799 - in /qpid/proton/branches/driver_abstraction:
examples/mailbox/fetch examples/mailbox/post proton-c/src/drivers/openssl.c
Author: kgiusti
Date: Mon Aug 27 19:21:24 2012
New Revision: 1377799
URL: http://svn.apache.org/viewvc?rev=1377799&view=rev
Log:
PROTON-2: prevent server from sending output before clear/encrypted status known.
Modified:
qpid/proton/branches/driver_abstraction/examples/mailbox/fetch
qpid/proton/branches/driver_abstraction/examples/mailbox/post
qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c
Modified: qpid/proton/branches/driver_abstraction/examples/mailbox/fetch
URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/examples/mailbox/fetch?rev=1377799&r1=1377798&r2=1377799&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/examples/mailbox/fetch (original)
+++ qpid/proton/branches/driver_abstraction/examples/mailbox/fetch Mon Aug 27 19:21:24 2012
@@ -84,7 +84,8 @@ class FetchClient(object):
# configure database of trusted CA's
if self.ca_database:
- rc = pn_connector_ssl_client_init(self.cxtr, self.ca_database);
+ self.log("Using CA database = %s" % self.ca_database)
+ rc = pn_connector_ssl_client_init(self.cxtr, self.ca_database)
assert(rc == 0)
# configure SASL
Modified: qpid/proton/branches/driver_abstraction/examples/mailbox/post
URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/examples/mailbox/post?rev=1377799&r1=1377798&r2=1377799&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/examples/mailbox/post (original)
+++ qpid/proton/branches/driver_abstraction/examples/mailbox/post Mon Aug 27 19:21:24 2012
@@ -85,6 +85,7 @@ class PostClient(object):
# configure database of trusted CA's
if self.ca_database:
+ self.log("Using CA database = %s" % self.ca_database)
rc = pn_connector_ssl_client_init(self.cxtr, self.ca_database);
assert(rc == 0)
Modified: qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c?rev=1377799&r1=1377798&r2=1377799&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c (original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c Mon Aug 27 19:21:24 2012
@@ -466,7 +466,8 @@ static int configure_ca_database(SSL_CTX
static int start_check_for_ssl( pn_connector_t *client )
{
printf("start_check_for_ssl()\n");
- client->status |= PN_SEL_RD;
+ client->status &= ~PN_SEL_WR; // don't start writing until
+ client->status |= PN_SEL_RD; // we've read from the client
client->io_handler = handle_check_for_ssl;
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org