You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2017/12/08 18:00:47 UTC

[1/5] qpid-proton git commit: PROTON-1713: Add missing 'of'

Repository: qpid-proton
Updated Branches:
  refs/heads/master 8166c2977 -> 7a936e9ce


PROTON-1713: Add missing 'of'


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

Branch: refs/heads/master
Commit: bcd6e0dba17b205cb7a35debef30acaf73d6173e
Parents: 8166c29
Author: Justin Ross <jr...@apache.org>
Authored: Fri Dec 8 07:53:29 2017 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Dec 8 07:53:54 2017 -0800

----------------------------------------------------------------------
 proton-c/bindings/cpp/docs/main.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bcd6e0db/proton-c/bindings/cpp/docs/main.md
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/docs/main.md b/proton-c/bindings/cpp/docs/main.md
index 798ac4b..25ba973 100644
--- a/proton-c/bindings/cpp/docs/main.md
+++ b/proton-c/bindings/cpp/docs/main.md
@@ -49,8 +49,8 @@ release.
 Sections labeled **Thread safety** describe when and where it is safe
 to call functions or access data across threads.
 
-Sections called **C++ versions** discuss features the API that depend
-on particular versions of C++ such as C++11.
+Sections called **C++ versions** discuss features of the API that
+depend on particular versions of C++ such as C++11.
 
 ## URLs
 


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


[4/5] qpid-proton git commit: PROTON-1549: Document legal values for the reconnect parameter

Posted by jr...@apache.org.
PROTON-1549: Document legal values for the reconnect parameter


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

Branch: refs/heads/master
Commit: 1eb8a7ba4bd58a1d1a73e5c6f2ce56c11409b4df
Parents: e4b5a4f
Author: Justin Ross <jr...@apache.org>
Authored: Fri Dec 8 09:41:50 2017 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Dec 8 09:41:50 2017 -0800

----------------------------------------------------------------------
 proton-c/bindings/python/proton/reactor.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1eb8a7ba/proton-c/bindings/python/proton/reactor.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/reactor.py b/proton-c/bindings/python/proton/reactor.py
index c210a8f..58045e9 100644
--- a/proton-c/bindings/python/proton/reactor.py
+++ b/proton-c/bindings/python/proton/reactor.py
@@ -698,9 +698,11 @@ class Container(Reactor):
 
         Only one of url or urls should be specified.
 
-        @param reconnect: A value of False will prevent the library
-        form automatically trying to reconnect if the underlying
-        socket is disconnected before the connection has been closed.
+        @param reconnect: Reconnect is enabled by default.  You can
+        pass in an instance of Backoff to control reconnect behavior.
+        A value of False will prevent the library from automatically
+        trying to reconnect if the underlying socket is disconnected
+        before the connection has been closed.
 
         @param heartbeat: A value in milliseconds indicating the
         desired frequency of heartbeats used to test the underlying


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


[3/5] qpid-proton git commit: PROTON-1680: Handle various string inputs for allowed SASL mechanisms and add docs

Posted by jr...@apache.org.
PROTON-1680: Handle various string inputs for allowed SASL mechanisms and add docs


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

Branch: refs/heads/master
Commit: e4b5a4fef1c7f31d11dbec62f40110141c373e49
Parents: d80a792
Author: Justin Ross <jr...@apache.org>
Authored: Fri Dec 8 09:35:00 2017 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Dec 8 09:35:00 2017 -0800

----------------------------------------------------------------------
 proton-c/bindings/python/proton/__init__.py |  2 +-
 proton-c/bindings/python/proton/reactor.py  | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e4b5a4fe/proton-c/bindings/python/proton/__init__.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/__init__.py b/proton-c/bindings/python/proton/__init__.py
index ddc7d3e..3671e2b 100644
--- a/proton-c/bindings/python/proton/__init__.py
+++ b/proton-c/bindings/python/proton/__init__.py
@@ -3573,7 +3573,7 @@ class SASL(Wrapper):
       return outcome
 
   def allowed_mechs(self, mechs):
-    pn_sasl_allowed_mechs(self._sasl, mechs)
+    pn_sasl_allowed_mechs(self._sasl, unicode2utf8(mechs))
 
   def _get_allow_insecure_mechs(self):
     return pn_sasl_get_allow_insecure_mechs(self._sasl)

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e4b5a4fe/proton-c/bindings/python/proton/reactor.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/reactor.py b/proton-c/bindings/python/proton/reactor.py
index 537b280..c210a8f 100644
--- a/proton-c/bindings/python/proton/reactor.py
+++ b/proton-c/bindings/python/proton/reactor.py
@@ -713,14 +713,15 @@ class Container(Reactor):
         called to process any events in the scope of this connection
         or its child links
 
-        @param kwargs: sasl_enabled, which determines whether a sasl layer is
-        used for the connection; allowed_mechs an optional list of SASL
-        mechanisms to allow if sasl is enabled; allow_insecure_mechs a flag
+        @param kwargs: sasl_enabled, which determines whether a sasl
+        layer is used for the connection; allowed_mechs an optional
+        string containing a space-separated list of SASL mechanisms to
+        allow if sasl is enabled; allow_insecure_mechs a flag
         indicating whether insecure mechanisms, such as PLAIN over a
-        non-encrypted socket, are allowed; 'virtual_host' the hostname to set
-        in the Open performative used by peer to determine the correct
-        back-end service for the client. If 'virtual_host' is not supplied the
-        host field from the URL is used instead."
+        non-encrypted socket, are allowed; 'virtual_host' the hostname
+        to set in the Open performative used by peer to determine the
+        correct back-end service for the client. If 'virtual_host' is
+        not supplied the host field from the URL is used instead."
 
         """
         conn = self.connection(handler)


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


[5/5] qpid-proton git commit: PROTON-1522: Document user and password args to reactor connect; warn users not to put users and passwords in URLs

Posted by jr...@apache.org.
PROTON-1522: Document user and password args to reactor connect; warn users not to put users and passwords in URLs


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

Branch: refs/heads/master
Commit: 7a936e9ce15372182a630761e6713af04401d119
Parents: 1eb8a7b
Author: Justin Ross <jr...@apache.org>
Authored: Fri Dec 8 09:51:12 2017 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Dec 8 09:51:12 2017 -0800

----------------------------------------------------------------------
 proton-c/bindings/python/proton/__init__.py |  4 ++++
 proton-c/bindings/python/proton/reactor.py  | 16 +++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7a936e9c/proton-c/bindings/python/proton/__init__.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/__init__.py b/proton-c/bindings/python/proton/__init__.py
index 3671e2b..21076ee 100644
--- a/proton-c/bindings/python/proton/__init__.py
+++ b/proton-c/bindings/python/proton/__init__.py
@@ -4172,6 +4172,10 @@ class Url(object):
   The port can be specified as a service name, e.g. 'amqp' in the
   URL string but Url.port always gives the integer value.
 
+  Warning: The placement of user and password in URLs is not
+  recommended.  It can result in credentials leaking out in program
+  logs.  Use connection configuration attributes instead.
+
   @ivar scheme: Url scheme e.g. 'amqp' or 'amqps'
   @ivar user: Username
   @ivar password: Password

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7a936e9c/proton-c/bindings/python/proton/reactor.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/reactor.py b/proton-c/bindings/python/proton/reactor.py
index 58045e9..e9ede47 100644
--- a/proton-c/bindings/python/proton/reactor.py
+++ b/proton-c/bindings/python/proton/reactor.py
@@ -715,15 +715,17 @@ class Container(Reactor):
         called to process any events in the scope of this connection
         or its child links
 
-        @param kwargs: sasl_enabled, which determines whether a sasl
-        layer is used for the connection; allowed_mechs an optional
+        @param kwargs: 'sasl_enabled', which determines whether a sasl
+        layer is used for the connection; 'allowed_mechs', an optional
         string containing a space-separated list of SASL mechanisms to
-        allow if sasl is enabled; allow_insecure_mechs a flag
+        allow if sasl is enabled; 'allow_insecure_mechs', a flag
         indicating whether insecure mechanisms, such as PLAIN over a
-        non-encrypted socket, are allowed; 'virtual_host' the hostname
-        to set in the Open performative used by peer to determine the
-        correct back-end service for the client. If 'virtual_host' is
-        not supplied the host field from the URL is used instead."
+        non-encrypted socket, are allowed; 'virtual_host', the
+        hostname to set in the Open performative used by peer to
+        determine the correct back-end service for the client. If
+        'virtual_host' is not supplied the host field from the URL is
+        used instead; 'user', the user to authenticate; 'password',
+        the authentication secret.
 
         """
         conn = self.connection(handler)


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


[2/5] qpid-proton git commit: PROTON-1081: Add missing call to pn_error_format

Posted by jr...@apache.org.
PROTON-1081: Add missing call to pn_error_format


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

Branch: refs/heads/master
Commit: d80a792ea06f069060da3df12a50647ef8edb714
Parents: bcd6e0d
Author: Justin Ross <jr...@apache.org>
Authored: Fri Dec 8 08:13:15 2017 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Dec 8 08:13:15 2017 -0800

----------------------------------------------------------------------
 proton-c/src/core/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d80a792e/proton-c/src/core/message.c
----------------------------------------------------------------------
diff --git a/proton-c/src/core/message.c b/proton-c/src/core/message.c
index e1f235b..548636b 100644
--- a/proton-c/src/core/message.c
+++ b/proton-c/src/core/message.c
@@ -828,7 +828,7 @@ int pn_message_data(pn_message_t *msg, pn_data_t *data)
     err = pn_data_append(data, msg->properties);
     if (err)
       return pn_error_format(msg->error, err, "data error: %s",
-                             pn_data_error(data));
+                             pn_error_text(pn_data_error(data)));
     pn_data_exit(data);
   }
 


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