]> granicus.if.org Git - libevent/commitdiff
Let evhttp_send_error infer the right error reasons
authorNick Mathewson <nickm@torproject.org>
Wed, 26 May 2010 16:58:02 +0000 (12:58 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 May 2010 17:43:01 +0000 (13:43 -0400)
evrpc.c
http.c

diff --git a/evrpc.c b/evrpc.c
index 43f4dcb548b96e8fdf54e51b9b6c824ef0668f5c..8765316d4fdf06a24fb15c529f67a134718648f8 100644 (file)
--- a/evrpc.c
+++ b/evrpc.c
@@ -324,7 +324,7 @@ evrpc_request_cb(struct evhttp_request *req, void *arg)
 error:
        if (rpc_state != NULL)
                evrpc_reqstate_free(rpc_state);
-       evhttp_send_error(req, HTTP_SERVUNAVAIL, "Service Error");
+       evhttp_send_error(req, HTTP_SERVUNAVAIL, NULL);
        return;
 }
 
@@ -363,7 +363,7 @@ evrpc_request_cb_closure(void *arg, enum EVRPC_HOOK_RESULT hook_res)
 error:
        if (rpc_state != NULL)
                evrpc_reqstate_free(rpc_state);
-       evhttp_send_error(req, HTTP_SERVUNAVAIL, "Service Error");
+       evhttp_send_error(req, HTTP_SERVUNAVAIL, NULL);
        return;
 }
 
@@ -440,7 +440,7 @@ evrpc_request_done(struct evrpc_req_generic *rpc_state)
 error:
        if (rpc_state != NULL)
                evrpc_reqstate_free(rpc_state);
-       evhttp_send_error(req, HTTP_SERVUNAVAIL, "Service Error");
+       evhttp_send_error(req, HTTP_SERVUNAVAIL, NULL);
        return;
 }
 
@@ -479,7 +479,7 @@ evrpc_request_done_closure(void *arg, enum EVRPC_HOOK_RESULT hook_res)
 error:
        if (rpc_state != NULL)
                evrpc_reqstate_free(rpc_state);
-       evhttp_send_error(req, HTTP_SERVUNAVAIL, "Service Error");
+       evhttp_send_error(req, HTTP_SERVUNAVAIL, NULL);
        return;
 }
 
diff --git a/http.c b/http.c
index 71850bb8800226874a37214b12a6c246f0c9126c..3f39e0bfa604dbcbb278fcfcecca35b5693d4acb 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2520,7 +2520,7 @@ evhttp_handle_request(struct evhttp_request *req, void *arg)
        req->userdone = 0;
 
        if (req->uri == NULL) {
-               evhttp_send_error(req, HTTP_BADREQUEST, "Bad Request");
+               evhttp_send_error(req, HTTP_BADREQUEST, NULL);
                return;
        }