Luca Boccassi
dfde9a22cc
Merge pull request #2526 from bjovke/my_work
...
Problem: GCC 6 build fails due to misleading indentation and visually ambiguous if/else block ordering.
2017-04-11 12:42:35 +01:00
bjovke
aa3540e657
Problem: misleading indentation and visually ambiguous if/else block ordering.
...
Solution: fixed indentation and if/else block.
2017-04-11 13:14:13 +02:00
Doron Somech
c2798ef0db
Merge pull request #2525 from swansontec/master
...
RELICENSE: William Swanson
2017-04-11 08:47:25 +03:00
William Swanson
0b1402ffc7
RELICENSE: William Swanson
2017-04-10 18:32:15 -07:00
Luca Boccassi
d815228246
Merge pull request #2523 from bjovke/my_working_branch
...
Critical BUG introduced with #2518 fixed.
2017-04-10 20:09:07 +01:00
Luca Boccassi
3b01410edc
Merge pull request #2524 from jakecobb/tcp_codestyle
...
Problem: Bad style in tcp.hpp/cpp
2017-04-10 19:13:48 +01:00
bjovke
c635ee7e9d
Critical BUG introduced with #2518 fixed.
2017-04-10 20:09:22 +02:00
Jake Cobb
f89e3ee854
Problem: Bad style in tcp.hpp/cpp
...
Solution: Add spaces between function
name and parentheses.
2017-04-10 13:57:29 -04:00
Luca Boccassi
2df4e87849
Merge pull request #2522 from bjovke/my_working_branch
...
Another macro correction.
2017-04-10 17:31:32 +01:00
Luca Boccassi
af6e071f65
Merge pull request #2521 from jakecobb/windows_tcptuning_consistency
...
Consistency of Windows TCP tuning assertions
2017-04-10 17:27:50 +01:00
Jake Cobb
cd39b00e19
Consistency of Windows TCP tuning assertions
...
Treat ECONNRESET, ENETRESET and EINTR as non-fatal
failures in TCP Tuning on Windows as they are in the
Unixes. Also adds ENETRESET to the Unix list that was missing.
2017-04-10 10:57:17 -04:00
bjovke
9bee9d6d03
Another macro correction.
2017-04-10 16:14:26 +02:00
Luca Boccassi
d66c2508cf
Merge pull request #2519 from bjovke/master
...
Case found not covered in latest zmq::proxy() code.
2017-04-10 15:01:27 +01:00
bjovke
b6fb1f64a5
Macro correction.
2017-04-10 15:39:20 +02:00
bjovke
2bdd06ca7e
Relicense file extensions corrected.
2017-04-10 14:36:30 +02:00
BJovke
64807214be
Merge pull request #2520 from twhittock/patch-1
...
Relicense: Tom Whittock grant
2017-04-10 14:33:43 +02:00
twhittock
6ecdd68153
Tom Whittock grant
2017-04-10 13:28:10 +01:00
bjovke
30cd655b3d
Case found not covered in latest zmq::proxy() code.
2017-04-10 14:10:47 +02:00
Doron Somech
545cacf5e2
Merge pull request #2518 from bjovke/master
...
Reworked zmq::proxy() for improved performance.
2017-04-10 12:50:15 +03:00
bjovke
26520fe152
zmq::socket_poller_t speed improvement for constructor and wait() function.
2017-04-10 11:35:08 +02:00
bjovke
a7977a5e84
Reworked zmq::proxy() for improved performance.
2017-04-10 11:34:24 +02:00
bjovke
3e55545ab0
Code reformatting of proxy.cpp
2017-04-10 11:30:52 +02:00
Luca Boccassi
2b543e7a2e
Merge pull request #2516 from meox/master
...
adding licence
2017-04-09 12:44:46 +01:00
meox
c8d6b67402
adding licence
2017-04-09 13:25:52 +02:00
Luca Boccassi
6853e3f935
Merge pull request #2514 from lytboris/freebsd-enable-ai_v4mapped
...
re-enable AI_V4MAPPED on FreeBSD & DragonFlyBSD
2017-04-09 10:24:50 +01:00
Constantin Rack
63e1984aa7
Merge pull request #2513 from lytboris/windows-assign-instead-compare
...
fix a typo - assigment was used instead of comparison
2017-04-09 10:58:59 +02:00
Boris Lytochkin
ef8b0c60fc
re-enable AI_V4MAPPED on FreeBSD & DragonFlyBSD
...
Detect AI_V4MAPPED is not supported in getaddrinfo() on the fly
and retry query. This issue was seen on ancient FreeBSD releases
and current implementation does support this flag correctly.
2017-04-09 11:49:21 +03:00
Boris Lytochkin
2b1bbf1673
fix a typo - assigment was used instead of comparison
2017-04-09 11:37:22 +03:00
Luca Boccassi
6a41f278c5
Merge pull request #2510 from lytboris/ipv6-resolve_nic_name-fix
...
choose IP(v6) address based on ipv6_ flag in a correct way
2017-04-08 22:27:20 +01:00
Thomas Rodgers
ac7d02e7b0
Relicense Grant ( #2511 )
...
* Relicense Grant - Thomas Rodgers (rodgert@twrodgers.com )
2017-04-08 22:26:55 +01:00
Boris Lytochkin
8bc92bde34
choose IP(v6) address based on ipv6_ flag in a correct way
2017-04-08 23:00:23 +03:00
Luca Boccassi
9846da02dc
Merge pull request #2507 from eburkitt/upmaster
...
Add relicense grant for eburkitt
2017-04-06 21:14:22 +01:00
Evan Burkitt
9dbf5791fb
Add relicense grant for eburkitt
2017-04-06 13:05:42 -07:00
Luca Boccassi
e5583cb043
Merge pull request #2495 from bluca/relicense_typo
...
Problem: typos in RELICENSE/ptroja.md
2017-04-06 09:59:32 +01:00
Yann Diorcet
c7fea39005
Fix asciidoc
2017-04-05 14:16:29 +02:00
Luca Boccassi
238aa49d55
Merge pull request #2504 from herbrechtsmeier/location
...
cmake: Use LOCATION property only for imported targets
2017-04-05 10:51:16 +01:00
Stefan Herbrechtsmeier
9deb6b023b
cmake: Use LOCATION property only for imported targets
...
Newer CMake versions allow use of the LOCATION target property only for
imported targets (CMP0026). Because the old package variables are only
needed for backward compatibility after configuration they could be
deactivated for super projects which build ZeroMQ together with other
projects.
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2017-04-05 11:26:13 +02:00
Luca Boccassi
96e61d9f95
Merge pull request #2503 from herbrechtsmeier/msvc
...
cmake: Remove build/msvc include path to remove file name clash
2017-04-05 09:28:34 +01:00
Stefan Herbrechtsmeier
2f367bddf7
cmake: Remove build/msvc include path to remove file name clash
...
Remove the `build/msvc` include path from the test project to fix a
problem with the order of the include paths. Additionally remove the
unnecessary `include_directories` from the master project.
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2017-04-05 10:03:07 +02:00
Luca Boccassi
926d2d2673
Merge pull request #2493 from herbrechtsmeier/cmake
...
CMake: Add cross compiling support and export targets to package config
2017-04-05 08:31:40 +01:00
Luca Boccassi
ac92fb54a6
Merge pull request #2502 from herbrechtsmeier/appveyor
...
appveyor: Use correct CURVE security options
2017-04-05 08:30:59 +01:00
Stefan Herbrechtsmeier
abbfed2b65
appveyor: Use correct CURVE security options
...
The AppVeyor build test options mismatch between command line options
and CMake CURVE security options. Rename the command line options to
the correct names.
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2017-04-05 08:57:48 +02:00
Constantin Rack
cd753eedb4
Merge pull request #2501 from mauri-melato/master
...
RELICENSE: mauri-melato grant
2017-04-04 21:19:29 +02:00
mauri-melato
0c2ffd6926
RELICENSE: Maurizio Melato grant
2017-04-04 21:00:35 +02:00
mauri-melato
84f83d6f2d
Merge pull request #1 from zeromq/master
...
Update the mauri-melato libzmq fork
2017-04-04 20:15:29 +02:00
Constantin Rack
699b3a2fd6
Merge pull request #2500 from kobolog/kobolog/relicense
...
Relicense
2017-04-04 19:08:30 +02:00
Andrey Sibiryov
d0427d13af
Relicense.
2017-04-04 13:03:47 -04:00
Stefan Herbrechtsmeier
f186421273
cmake: Export targets to package config
...
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2017-04-04 15:48:39 +02:00
Stefan Herbrechtsmeier
4e3e3f659d
cmake: Disable runtime checks while cross compiling
...
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2017-04-04 15:48:39 +02:00
Stefan Herbrechtsmeier
556de55e4c
cmake: Use project specific source directory instead of top level source tree
...
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2017-04-04 15:48:39 +02:00