@@ -384,10 +384,14 @@ conn *conn_new(const int sfd, enum conn_states init_state,
} else if (c->protocol == negotiating_prot) {
fprintf(stderr, "<%d new auto-negotiating client connection\n",
sfd);
+ } else if (c->protocol == ascii_prot) {
+ fprintf(stderr, "<%d new ascii client connection.\n", sfd);
+ } else if (c->protocol == binary_prot) {
+ fprintf(stderr, "<%d new binary client connection.\n", sfd);
} else {
fprintf(stderr, "<%d new unknown (%d) client connection\n",
sfd, c->protocol);
- abort();
+ assert(false);
}
}
memcached.c
@@ -1,7 +1,7 @@
#!/usr/bin/perl
use strict;
-use Test::More tests => 14;
+use Test::More tests => 17;
use FindBin qw($Bin);
use lib "$Bin/lib";
use MemcachedTest;
@@ -51,6 +51,24 @@ eval {
};
is($@, '', "binary works");
+eval {
+ my $server = new_memcached("-vv -B auto");
+};
+is($@, '', "auto works");
+
+eval {
+ my $server = new_memcached("-vv -B ascii");
+};
+is($@, '', "ascii works");
+
+
+# For the binary test, we just verify it starts since we don't have an easy bin client.
+eval {
+ my $server = new_memcached("-vv -B binary");
+};
+is($@, '', "binary works");
+
+
# Should blow up with something invalid.
eval {
my $server = new_memcached("-B http");
t/00-startup.t
0a1e88dafc02db59d64366b85441d73a7ddb87a9
Dustin Sallings
dustin@spy.net
http://github.com/dustin/memcached/commit/c666e344fadbb1460ee0f4a148263b429999a714
c666e344fadbb1460ee0f4a148263b429999a714
2009-05-15T07:00:58-07:00
2009-05-14T15:30:39-07:00
Don't abort when creating a socket with an unknown binding protocol.
This changes the abort to an assert and tests for such failures.
abed10556d23f480e0f7fb3b13b79ba01318815b
Trond Norbye
Trond.Norbye@sun.com