3c99d88354
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]
74 lines
2.5 KiB
C
74 lines
2.5 KiB
C
--- 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++;
|
|
|
|
- if (IS_UDP(c->transport)) {
|
|
+ if IS_UDP(c->transport) {
|
|
/* 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_
|
|
if (init_state == conn_listening) {
|
|
fprintf(stderr, "<%d server listening (%s)\n", sfd,
|
|
prot_text(c->protocol));
|
|
- } else if (IS_UDP(transport)) {
|
|
+ } else if IS_UDP(transport) {
|
|
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) {
|
|
c->sasl_conn = NULL;
|
|
}
|
|
|
|
- if (IS_UDP(c->transport)) {
|
|
+ if IS_UDP(c->transport) {
|
|
conn_set_state(c, conn_read);
|
|
}
|
|
}
|
|
@@ -601,7 +601,7 @@ static void conn_close(conn *c) {
|
|
static void conn_shrink(conn *c) {
|
|
assert(c != NULL);
|
|
|
|
- if (IS_UDP(c->transport))
|
|
+ if IS_UDP(c->transport)
|
|
return;
|
|
|
|
if (c->rsize > READ_BUFFER_HIGHWAT && c->rbytes < DATA_BUFFER_SIZE) {
|
|
@@ -4022,7 +4022,7 @@ static enum transmit_result transmit(con
|
|
if (settings.verbose > 0)
|
|
perror("Failed to write, and not due to blocking");
|
|
|
|
- if (IS_UDP(c->transport))
|
|
+ if IS_UDP(c->transport)
|
|
conn_set_state(c, conn_read);
|
|
else
|
|
conn_set_state(c, conn_closing);
|
|
@@ -4346,7 +4346,7 @@ static void drive_machine(conn *c) {
|
|
break;
|
|
|
|
case conn_closing:
|
|
- if (IS_UDP(c->transport))
|
|
+ if IS_UDP(c->transport)
|
|
conn_cleanup(c);
|
|
else
|
|
conn_close(c);
|
|
@@ -4506,7 +4506,7 @@ static int server_socket(const char *int
|
|
#endif
|
|
|
|
setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
|
|
- if (IS_UDP(transport)) {
|
|
+ if IS_UDP(transport) {
|
|
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
|
|
}
|
|
}
|
|
|
|
- if (IS_UDP(transport)) {
|
|
+ if IS_UDP(transport) {
|
|
int c;
|
|
|
|
for (c = 0; c < settings.num_threads_per_udp; c++) {
|