diff options
author | Steve Wills <swills@FreeBSD.org> | 2015-06-27 20:42:04 +0000 |
---|---|---|
committer | Steve Wills <swills@FreeBSD.org> | 2015-06-27 20:42:04 +0000 |
commit | 3c99d88354324c3494d3ca1b44771b23751c393c (patch) | |
tree | 96e48f2846ba6bc9b0c60f88034c761483b82b91 /databases/memcached/files/patch-memcached.c | |
parent | Update to 2.2.4 (diff) |
databases/memcached: update to 1.4.24
While here, re-generate existing patches
Also, add memcached_post_start to rc script [1]
Submitted by: Maximilian Boße <Maximilian.Bosse@trivago.com> (private email) [1]
Notes
Notes:
svn path=/head/; revision=390730
Diffstat (limited to 'databases/memcached/files/patch-memcached.c')
-rw-r--r-- | databases/memcached/files/patch-memcached.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/databases/memcached/files/patch-memcached.c b/databases/memcached/files/patch-memcached.c index e8ad907f82ee..52bca8697992 100644 --- a/databases/memcached/files/patch-memcached.c +++ b/databases/memcached/files/patch-memcached.c @@ -1,6 +1,6 @@ ---- memcached.c.orig 2014-10-13 03:33:10.000000000 +0000 -+++ memcached.c 2015-01-16 16:21:34.000000000 +0000 -@@ -280,7 +280,7 @@ +--- memcached.c.orig 2015-04-20 05:34:19 UTC ++++ memcached.c +@@ -288,7 +288,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); } -@@ -424,7 +424,7 @@ +@@ -432,7 +432,7 @@ conn *conn_new(const int sfd, enum conn_ 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", -@@ -523,7 +523,7 @@ +@@ -531,7 +531,7 @@ static void conn_cleanup(conn *c) { c->sasl_conn = NULL; } @@ -27,7 +27,7 @@ conn_set_state(c, conn_read); } } -@@ -593,7 +593,7 @@ +@@ -601,7 +601,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) { -@@ -3989,7 +3989,7 @@ +@@ -4022,7 +4022,7 @@ static enum transmit_result transmit(con 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); -@@ -4313,7 +4313,7 @@ +@@ -4346,7 +4346,7 @@ static void drive_machine(conn *c) { break; case conn_closing: @@ -54,7 +54,7 @@ conn_cleanup(c); else conn_close(c); -@@ -4473,7 +4473,7 @@ +@@ -4506,7 +4506,7 @@ static int server_socket(const char *int #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)); -@@ -4528,7 +4528,7 @@ +@@ -4561,7 +4561,7 @@ static int server_socket(const char *int } } |