summaryrefslogtreecommitdiff
path: root/databases/memcached/files/patch-memcached.c
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2018-02-16 13:40:24 +0000
committerSteve Wills <swills@FreeBSD.org>2018-02-16 13:40:24 +0000
commit1eb32691d24506d298d2241c0dca71fc2c072248 (patch)
treed7584c8ab3226c157154fcdb1b0cf6bc96be0b6d /databases/memcached/files/patch-memcached.c
parentsecurity/openssl-devel: Mark broken category benchmarks (diff)
databases/memcached: update to 1.5.5
While here, re-generate patches.
Notes
Notes: svn path=/head/; revision=462012
Diffstat (limited to 'databases/memcached/files/patch-memcached.c')
-rw-r--r--databases/memcached/files/patch-memcached.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/databases/memcached/files/patch-memcached.c b/databases/memcached/files/patch-memcached.c
index 52bca8697992..99756fc67fde 100644
--- a/databases/memcached/files/patch-memcached.c
+++ b/databases/memcached/files/patch-memcached.c
@@ -1,6 +1,6 @@
---- memcached.c.orig 2015-04-20 05:34:19 UTC
+--- memcached.c.orig 2018-02-13 05:09:37 UTC
+++ memcached.c
-@@ -288,7 +288,7 @@ static int add_msghdr(conn *c)
+@@ -316,7 +316,7 @@ static int add_msghdr(conn *c)
c->msgbytes = 0;
c->msgused++;
@@ -9,7 +9,7 @@
/* Leave room for the UDP header, which we'll fill in later. */
return add_iov(c, NULL, UDP_HEADER_SIZE);
}
-@@ -432,7 +432,7 @@ conn *conn_new(const int sfd, enum conn_
+@@ -582,7 +582,7 @@ conn *conn_new(const int sfd, enum conn_states init_st
if (init_state == conn_listening) {
fprintf(stderr, "<%d server listening (%s)\n", sfd,
prot_text(c->protocol));
@@ -18,7 +18,7 @@
fprintf(stderr, "<%d server listening (udp)\n", sfd);
} else if (c->protocol == negotiating_prot) {
fprintf(stderr, "<%d new auto-negotiating client connection\n",
-@@ -531,7 +531,7 @@ static void conn_cleanup(conn *c) {
+@@ -752,7 +752,7 @@ static void conn_cleanup(conn *c) {
c->sasl_conn = NULL;
}
@@ -27,7 +27,7 @@
conn_set_state(c, conn_read);
}
}
-@@ -601,7 +601,7 @@ static void conn_close(conn *c) {
+@@ -822,7 +822,7 @@ static void conn_close(conn *c) {
static void conn_shrink(conn *c) {
assert(c != NULL);
@@ -36,7 +36,7 @@
return;
if (c->rsize > READ_BUFFER_HIGHWAT && c->rbytes < DATA_BUFFER_SIZE) {
-@@ -4022,7 +4022,7 @@ static enum transmit_result transmit(con
+@@ -5253,7 +5253,7 @@ static enum transmit_result transmit(conn *c) {
if (settings.verbose > 0)
perror("Failed to write, and not due to blocking");
@@ -45,7 +45,7 @@
conn_set_state(c, conn_read);
else
conn_set_state(c, conn_closing);
-@@ -4346,7 +4346,7 @@ static void drive_machine(conn *c) {
+@@ -5694,7 +5694,7 @@ static void drive_machine(conn *c) {
break;
case conn_closing:
@@ -54,7 +54,7 @@
conn_cleanup(c);
else
conn_close(c);
-@@ -4506,7 +4506,7 @@ static int server_socket(const char *int
+@@ -5858,7 +5858,7 @@ static int server_socket(const char *interface,
#endif
setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
@@ -63,7 +63,7 @@
maximize_sndbuf(sfd);
} else {
error = setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&flags, sizeof(flags));
-@@ -4561,7 +4561,7 @@ static int server_socket(const char *int
+@@ -5913,7 +5913,7 @@ static int server_socket(const char *interface,
}
}