You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/11/26 21:06:04 UTC
[17/35] qpid-proton git commit: PROTON-749,
PROTON-750: Merge these changes into development stream.
PROTON-749, PROTON-750: Merge these changes into development stream.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/b4e06d34
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/b4e06d34
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/b4e06d34
Branch: refs/heads/examples
Commit: b4e06d34a83cd942ea88a5e19ad938be312ed2ae
Parents: 7b91e1f 0cc9134
Author: Andrew Stitcher <as...@apache.org>
Authored: Thu Nov 20 10:51:10 2014 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 20 10:51:10 2014 -0500
----------------------------------------------------------------------
proton-c/CMakeLists.txt | 1 +
proton-c/bindings/python/proton.py | 35 +-
proton-c/include/proton/cproton.i | 2 +-
proton-c/include/proton/sasl.h | 20 +-
proton-c/include/proton/ssl.h | 6 +
proton-c/include/proton/transport.h | 20 +-
proton-c/src/engine/engine-internal.h | 36 +-
proton-c/src/messenger/messenger.c | 3 +-
proton-c/src/posix/driver.c | 8 +-
proton-c/src/proton.c | 10 +-
proton-c/src/sasl/sasl-internal.h | 6 +-
proton-c/src/sasl/sasl.c | 294 +++++++-----
proton-c/src/ssl/openssl.c | 452 ++++++++-----------
proton-c/src/ssl/ssl-internal.h | 6 +-
proton-c/src/ssl/ssl_stub.c | 22 +-
proton-c/src/tests/engine.c | 3 +
proton-c/src/transport/autodetect.c | 135 ++++++
proton-c/src/transport/autodetect.h | 40 ++
proton-c/src/transport/transport.c | 422 +++++++++++------
proton-c/src/windows/driver.c | 8 +-
proton-c/src/windows/schannel.c | 371 +++++++--------
.../qpid/proton/engine/impl/SaslImpl.java | 7 +-
proton-j/src/main/resources/cengine.py | 5 +-
proton-j/src/main/resources/csasl.py | 14 +-
proton-j/src/main/resources/cssl.py | 3 +
tests/python/proton_tests/common.py | 13 +-
tests/python/proton_tests/engine.py | 3 -
tests/python/proton_tests/sasl.py | 14 +-
28 files changed, 1132 insertions(+), 827 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org