generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-25 15:46:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2288 from paddor/master

Browse Source 
fix typos
This commit is contained in:
Luca Boccassi 2017-01-03 12:49:34 +01:00 committed by GitHub
commit dce4d06b71
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/zmq_gssapi.txt
View File

@ -29,9 +29,9 @@ for whom GSSAPI credentials should be acquired.
To become a GSSAPI server, the application additionally sets the
ZMQ_GSSAPI_SERVER option on the socket.
To become a GSSAPI client, the application sets additionally sets the
To become a GSSAPI client, the application additionally sets the
ZMQ_GSSAPI_SERVICE_PRINCIPAL option to the name of the principal of the server
to which it intends to connect.
to which it intends to connect.
OPTIONAL ENCRYPTION

2
doc/zmq_setsockopt.txt
View File

@ -203,7 +203,7 @@ Applicable socket types:: all, when using TCP transport
ZMQ_GSSAPI_PLAINTEXT: Disable GSSAPI encryption
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Defines whether communications on the socket will encrypted, see
Defines whether communications on the socket will be encrypted, see
linkzmq:zmq_gssapi[7]. A value of '1' means that communications will be
plaintext. A value of '0' means communications will be encrypted.

2
src/socket_base.cpp
View File

@ -1205,7 +1205,7 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
// If the message cannot be fetched immediately, there are two scenarios.
// For non-blocking recv, commands are processed in case there's an
// activate_reader command already waiting int a command pipe.
// activate_reader command already waiting in a command pipe.
// If it's not, return EAGAIN.
if (flags_ & ZMQ_DONTWAIT || options.rcvtimeo == 0) {
if (unlikely (process_commands (0, false) != 0)) {