summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/protocol.txt4
-rw-r--r--memcached.c4
-rw-r--r--memcached.h2
-rw-r--r--testapp.c2
-rw-r--r--tls.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/doc/protocol.txt b/doc/protocol.txt
index b4771e9..e059d2d 100644
--- a/doc/protocol.txt
+++ b/doc/protocol.txt
@@ -554,7 +554,7 @@ These flags can modify the item:
These extra flags can be added to the response:
- W: client has "won" the recache flag
- X: item is stale
-- Z: tem has already sent a winning flag
+- Z: item has already sent a winning flag
The flags are now repeated with detailed information where useful:
@@ -1334,7 +1334,7 @@ integers separated by a colon (treat this as a floating point number).
| log_worker_written | 64u | Logs written by a worker, to be picked up |
| log_watcher_skipped | 64u | Logs not sent to slow watchers. |
| log_watcher_sent | 64u | Logs written to watchers. |
-| unexected_napi_ids | 64u | Number of times an unexpected napi id is |
+| unexpected_napi_ids | 64u | Number of times an unexpected napi id is |
| | | is received. See doc/napi_ids.txt |
| round_robin_fallback | 64u | Number of times napi id of 0 is received |
| | | resulting in fallback to round robin |
diff --git a/memcached.c b/memcached.c
index b1d5144..164d56c 100644
--- a/memcached.c
+++ b/memcached.c
@@ -3025,7 +3025,7 @@ static void drive_machine(conn *c) {
case conn_parse_cmd:
c->noreply = false;
if (c->try_read_command(c) == 0) {
- /* wee need more data! */
+ /* we need more data! */
if (c->resp_head) {
// Buffered responses waiting, flush in the meantime.
conn_set_state(c, conn_mwrite);
@@ -4249,7 +4249,7 @@ static int _mc_meta_save_cb(const char *tag, void *ctx, void *data) {
// TODO: should get a version of version which is numeric, else
// comparisons for compat reasons are difficult.
// it may be possible to punt on this for now; since we can test for the
- // absense of another key... such as the new numeric version.
+ // absence of another key... such as the new numeric version.
//restart_set_kv(ctx, "version", "%s", VERSION);
// We hold the original factor or subopts _string_
// it can be directly compared without roundtripping through floats or
diff --git a/memcached.h b/memcached.h
index 04bd169..8648f25 100644
--- a/memcached.h
+++ b/memcached.h
@@ -483,7 +483,7 @@ struct settings {
char *ssl_chain_cert; /* path to the server SSL chain certificate */
char *ssl_key; /* path to the server key */
int ssl_verify_mode; /* client certificate verify mode */
- int ssl_keyformat; /* key format , defult is PEM */
+ int ssl_keyformat; /* key format , default is PEM */
char *ssl_ciphers; /* list of SSL ciphers */
char *ssl_ca_cert; /* certificate with CAs. */
rel_time_t ssl_last_cert_refresh_time; /* time of the last server certificate refresh */
diff --git a/testapp.c b/testapp.c
index 47cb103..390f175 100644
--- a/testapp.c
+++ b/testapp.c
@@ -906,7 +906,7 @@ static enum test_return test_crc32c(void) {
for (int x = 0; x < 256; x++)
buffer[x] = x;
- /* Compare harware to software implementaiton */
+ /* Compare hardware to software implementation */
crc_hw = crc32c(0, buffer, 256);
crc_sw = crc32c_sw(0, buffer, 256);
assert(crc_hw == 0x9c44184b);
diff --git a/tls.c b/tls.c
index 7b99fd2..df42308 100644
--- a/tls.c
+++ b/tls.c
@@ -53,7 +53,7 @@ ssize_t ssl_sendmsg(conn *c, struct msghdr *msg, int flags) {
// the sendmsg method. Also, set c->ssl_wbuf when the side thread
// start owning the connection and reset the pointer in
// conn_worker_readd.
- // Currntly this connection would not be served by a different thread
+ // Currently this connection would not be served by a different thread
// than the one it's assigned.
assert(pthread_equal(c->thread->thread_id, pthread_self()) != 0);