Commit Graph

852 Commits

Author SHA1 Message Date
Yossi Gottlieb d952ed877a Add SSL mode tests.
This repeats all existing tests in SSL mode, but does not yet provide
SSL-specific tests.
2019-09-16 17:30:35 +03:00
Yossi Gottlieb a1e538092d Make SSL timeout error compatible with rest. 2019-09-16 17:30:35 +03:00
Yossi Gottlieb d41443bd3d Fix: redisReconnect() should clear SSL context.
We should not attempt to keep the context and re-establish the
TLS connection for several reasons:

1. Maintain symmetry between redisConnect() and redisReconnect(), so in
both cases an extra step is required to initiate SSL.
2. The caller may also wish to reconfigure the SSL session and needs a
chance to do that.
3. It is not a practical thing to do on an async non-blocking connection
context.
2019-09-16 17:30:35 +03:00
Mark Nunberg bd2c8fedf7
Merge pull request #708 from yossigo/wip/ssl-reorganization
SSL Reorganization
2019-09-16 06:05:46 -04:00
Yossi Gottlieb dd408e8e3f Update CMakelists for hiredis/hiredis_ssl builds.
Also rename the SSL option from `HIREDIS_SSL` to `ENABLE_SSL` to conform
with CMake convnetions.
2019-09-01 13:47:39 +03:00
Yossi Gottlieb 5872d818d9 Separate hiredis and hiredis_ssl library build. 2019-09-01 13:46:27 +03:00
Yossi Gottlieb 5c85a04164 Use a const funcs in redisContext. 2019-09-01 13:46:07 +03:00
Yossi Gottlieb 44ef4de9d9 Update CMakeLists with sslio.c rename. 2019-08-29 22:21:40 +03:00
Yossi Gottlieb df68d7d8bd Rename sslio. 2019-08-29 22:14:09 +03:00
Yossi Gottlieb 8715ba5c82 wip: SSL code reorganization, see #705. 2019-08-29 22:09:37 +03:00
Mark Nunberg 1ac8fca35d
Merge pull request #706 from yossigo/fix/msvc
Fix MSVC build.
2019-08-29 10:14:34 -04:00
Yossi Gottlieb 28759c4b81 Fix MSVC build. 2019-08-28 18:43:40 +03:00
Mark Nunberg 2020f6f329
Merge pull request #702 from yossigo/report-connect-errors
SSL: Properly report SSL_connect() errors.
2019-08-27 07:10:25 -04:00
Mark Nunberg ff4fa45422
Merge pull request #697 from yossigo/resp3
Port RESP3 support from Redis.
2019-08-27 06:59:32 -04:00
Mark Nunberg ce7cb7bcc4
Merge pull request #699 from yossigo/silent-ssl-trace
Silent SSL trace to stdout by default.
2019-08-27 06:58:55 -04:00
Yossi Gottlieb aacd4ccd76 Fix typo. 2019-08-25 11:43:27 +03:00
Yossi Gottlieb 153b8f632b SSL: Properly report SSL_connect() errors. 2019-08-22 16:20:41 +03:00
Mark Nunberg 9c7c694cb7
Merge pull request #670 from jman-krafton/master
fix timeout code in windows
2019-08-13 08:50:41 -04:00
Yossi Gottlieb 6d21ffce7c Silent SSL trace to stdout by default. 2019-08-13 12:51:47 +03:00
Sangmoon Yi 8e61d5737a add recv error code for clarifying timeout 2019-08-12 10:55:08 +09:00
Sangmoon Yi ab1762cd92 fix timeout code in windows 2019-08-12 10:54:12 +09:00
Mark Nunberg ac49287c3d
Merge pull request #663 from mbitsnbites/mingw-support-2
Windows: MinGW fixes and Windows Travis builders
2019-08-09 07:37:28 -04:00
Marcus Geelnard bbbafc5324 Travis: Add a Windows MSVC 2017 compilation test 2019-08-09 11:49:02 +02:00
Marcus Geelnard 687997c410 Travis: Add a MinGW cross compilation test 2019-08-09 11:49:02 +02:00
Marcus Geelnard 173f16ab55 MSVC: Fix some compiler warnings in sds.h 2019-08-09 11:49:02 +02:00
Marcus Geelnard 85fee25653 MinGW fix: Use _MSC_VER instead of _WIN32 where appropriate
Use _MSC_VER (instead of _WIN32) for things that are specific for
Visual Studio.

Also remove #include <winsock2.h> from hiredis.h, as it leaks too
many symbols and defines into the global namespace, which is
undesirable for a public interface header. Anyone who uses the
the affected parts of the hiredis API needs to include the
appropriate headers anyway in order to declare struct timeval
variables.
2019-08-09 11:49:02 +02:00
Mark Nunberg 3af99d5fd5
Merge pull request #597 from justinbrewer/createArray-size_t
Update createArray to take size_t
2019-08-09 04:03:02 -04:00
Mark Nunberg f9bccfb7ba
Merge branch 'master' into createArray-size_t 2019-08-09 04:02:53 -04:00
Mark Nunberg 5d013039a9
Merge pull request #621 from Crunsher/master
Update README.md
2019-08-09 03:54:24 -04:00
Mark Nunberg fe215464ca
Merge pull request #662 from dragonation/master
The setsockopt and getsockopt API diffs from BSD socket and WSA one
2019-08-09 03:52:06 -04:00
Mark Nunberg b1fa77d023
Merge pull request #665 from ghost/musl-test-compat
test: fix errstr matching for musl libc
2019-08-09 03:48:56 -04:00
Mark Nunberg 99cdec371f
Merge pull request #671 from movebean/master
redisReaderGetReply leak memory
2019-08-09 03:44:25 -04:00
Mark Nunberg fbb83c4a7a
Merge pull request #684 from qlyoung/remove-unnecessary-nullcheck
Remove unnecessary null check before free
2019-08-09 03:40:32 -04:00
Mark Nunberg 9414207002
Merge pull request #688 from kevin1018/patch-1
Add install adapters header files
2019-08-09 03:40:05 -04:00
Mark Nunberg c259f9059d
Merge pull request #691 from Miniwoffer/master
Removed whitespace before newline
2019-08-09 03:39:39 -04:00
Yossi Gottlieb 91de9c975a RESP3 support changes from Redis.
This corresponds to commits d5c54f0b..bea09a7f in the redis repository.
2019-08-04 12:13:04 +03:00
Yossi Gottlieb a7a1886b7e Initial RESP3 support [d5c54f0b]. 2019-08-04 11:55:24 +03:00
Odin Hultgren Van Der Horst a1d4da63b8 Removed whitespace before newline
- Removed whitespace before newline
 - Removed win style newline
2019-07-22 11:06:10 +02:00
kevin1018 8249e67355
Add install adapters header files 2019-07-17 19:05:06 +08:00
Quentin Young 83d3c097ef Remove unnecessary null check before free 2019-07-03 21:36:48 +00:00
qi.yang 918e24c83b redisReaderGetReply leak memory 2019-05-30 15:03:38 +08:00
Eivind Uggedal 993af7710e test: fix errstr matching for musl libc
This makes the tests pass on musl[1] based distros like Alpine Linux.

[1]: https://www.musl-libc.org/
2019-05-14 07:29:26 +00:00
Minun Dragonation 76394f1be8 remove useless type casting 2019-05-13 23:20:05 +08:00
Minun Dragonation f5454d509f fix bugs on socket timeout tv usec calculation 2019-05-05 21:58:34 +08:00
Minun Dragonation 4a94ce6326 fix bugs for optlen output on size not big enough for timeout events 2019-05-05 21:46:34 +08:00
Minun Dragonation 82252440de fix bugs on ref address incorrect on sockcompact with getsockopt 2019-05-05 21:39:46 +08:00
Minun Dragonation d8f814d48b fix bugs of setsockopt diff in win compact implementation 2019-05-05 21:34:28 +08:00
Mark Nunberg f5f855c912
Merge pull request #658 from jinjiazhang/master
Fix Compile Error On Windows (Visual Studio)
2019-04-13 09:16:46 -04:00
jinjiazhang cdb836d5f8 Fix Compile Error On Windows (Visual Studio) 2019-04-13 10:38:34 +08:00
Mark Nunberg 5aa2397f9e fix blocking timeouts on SSL reads/writes 2019-04-11 15:08:27 -04:00