mirror of
https://git.freebsd.org/ports.git
synced 2025-06-21 12:40:45 -04:00
41e56db75f
Regenerate the patches to make portlint(1) happier. <ChangeLog> Upgrade urgency CRITICAL: Only in case of exposed instances to untrusted users. This Redis release, 5.0.6, is a bugfix and enhancement release. The most important bugfix is a corruption related to the HyperLogLog. A malformed HyperLogLog string could cause an invalid access to the memory. At a first glance the vulnerability appears to be not exploitable but just a DoS. The way to trigger the issue is complex, we'll not provide any information about how to do that for the users safety. Other significant changes in this release: * New modules APIs merged from Redis unstable to Redis 5. * Some memory optimization related to objects creation. * Fixes to flushSlaveOutputBuffer() that make sure that SHUTDOWN will transfer pending buffers to replicas. </ChangeLog>
64 lines
2.2 KiB
C
64 lines
2.2 KiB
C
--- deps/hiredis/net.c.orig 2019-09-25 10:40:18 UTC
|
|
+++ deps/hiredis/net.c
|
|
@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
|
|
|
|
val = interval;
|
|
|
|
-#ifdef _OSX
|
|
+#if defined(_OSX)
|
|
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
|
|
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
|
return REDIS_ERR;
|
|
}
|
|
-#else
|
|
-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
|
|
+#elif defined(__GLIBC__)
|
|
val = interval;
|
|
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
|
|
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
|
@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
|
|
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
|
return REDIS_ERR;
|
|
}
|
|
+#else
|
|
+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && \
|
|
+ defined(TCP_KEEPCNT)
|
|
+ val = interval;
|
|
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
|
|
+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
|
+ return REDIS_ERR;
|
|
+ }
|
|
+
|
|
+ val = interval/3;
|
|
+ if (val == 0) val = 1;
|
|
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
|
|
+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
|
+ return REDIS_ERR;
|
|
+ }
|
|
+
|
|
+ val = 3;
|
|
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
|
|
+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
|
+ return REDIS_ERR;
|
|
+ }
|
|
#endif
|
|
#endif
|
|
|
|
@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
|
|
struct sockaddr_un sa;
|
|
long timeout_msec = -1;
|
|
|
|
- if (redisCreateSocket(c,AF_LOCAL) < 0)
|
|
+ if (redisCreateSocket(c,AF_UNIX) < 0)
|
|
return REDIS_ERR;
|
|
if (redisSetBlocking(c,0) != REDIS_OK)
|
|
return REDIS_ERR;
|
|
@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
|
|
if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
|
|
return REDIS_ERR;
|
|
|
|
- sa.sun_family = AF_LOCAL;
|
|
+ sa.sun_family = AF_UNIX;
|
|
strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
|
|
if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
|
|
if (errno == EINPROGRESS && !blocking) {
|