Permalink
Browse files

Remove BSON support

  • Loading branch information...
1 parent 8a8ab84 commit 2c634fa0714af4741d6f6e1769267ab81a83a252 @nicolasff committed Sep 21, 2012
Showing with 5 additions and 576 deletions.
  1. +2 −2 Makefile
  2. +0 −2 README.markdown
  3. +0 −2 cmd.c
  4. +0 −442 formats/bson.c
  5. +0 −68 formats/bson.h
  6. +0 −59 tests/basic.py
  7. +3 −1 webdis.json
View
@@ -1,10 +1,10 @@
OUT=webdis
HIREDIS_OBJ=hiredis/hiredis.o hiredis/sds.o hiredis/net.o hiredis/async.o
JANSSON_OBJ=jansson/src/dump.o jansson/src/error.o jansson/src/hashtable.o jansson/src/load.o jansson/src/strbuffer.o jansson/src/utf.o jansson/src/value.o jansson/src/variadic.o
-FORMAT_OBJS=formats/json.o formats/raw.o formats/common.o formats/custom-type.o formats/bson.o
+FORMAT_OBJS=formats/json.o formats/raw.o formats/common.o formats/custom-type.o
HTTP_PARSER_OBJS=http-parser/http_parser.o
-CFLAGS=-O3 -Wall -Wextra -I. -Ijansson/src -Ihttp-parser
+CFLAGS=-O0 -ggdb -Wall -Wextra -I. -Ijansson/src -Ihttp-parser
LDFLAGS=-levent -pthread
# check for MessagePack
View
@@ -23,7 +23,6 @@ curl -d "GET/hello" http://127.0.0.1:7379/
* GET and POST are supported, as well as `PUT` for file uploads.
* JSON output by default, optional JSONP parameter (`?jsonp=myFunction` or `?callback=myFunction`).
* Raw Redis 2.0 protocol output with `.raw` suffix
-* BSON support for compact responses and MongoDB compatibility.
* MessagePack output with `.msg` suffix
* HTTP 1.1 pipelining (70,000 http requests per second on a desktop Linux machine.)
* Multi-threaded server, configurable number of worker threads.
@@ -173,7 +172,6 @@ $ curl http://127.0.0.1:7379/MAKE-ME-COFFEE.raw
Several content-types are available:
* `.json` for `application/json` (this is the default Content-Type).
-* `.bson` for `application/bson`. See [http://bsonspec.org/](http://bsonspec.org/) for the specs.
* `.msg` for `application/x-msgpack`. See [http://msgpack.org/](http://msgpack.org/) for the specs.
* `.txt` for `text/plain`
* `.html` for `text/html`
View
2 cmd.c
@@ -8,7 +8,6 @@
#include "server.h"
#include "formats/json.h"
-#include "formats/bson.h"
#include "formats/raw.h"
#ifdef MSGPACK
#include "formats/msgpack.h"
@@ -302,7 +301,6 @@ cmd_select_format(struct http_client *client, struct cmd *cmd,
struct reply_format funs[] = {
{.s = "json", .sz = 4, .f = json_reply, .ct = "application/json"},
{.s = "raw", .sz = 3, .f = raw_reply, .ct = "binary/octet-stream"},
- {.s = "bson", .sz = 4, .f = bson_reply, .ct = "application/bson"},
#ifdef MSGPACK
{.s = "msg", .sz = 3, .f = msgpack_reply, .ct = "application/x-msgpack"},
Oops, something went wrong.

0 comments on commit 2c634fa

Please sign in to comment.