cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-15 15:25:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tweak interface for allowed methods

Browse Source
This commit is contained in:
Nick Mathewson 2010-11-04 11:53:34 -04:00
parent 75a73414a4
commit f5b391e22e
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
http-internal.h
View File

@ -145,8 +145,9 @@ struct evhttp {
size_t default_max_headers_size; size_t default_max_headers_size;
ev_uint64_t default_max_body_size; ev_uint64_t default_max_body_size;
/* bitmask of all allowed methods */ /* Bitmask of all HTTP methods that we accept and pass to user
short allowed_methods; * callbacks. */
ev_uint16_t allowed_methods;
/* Fallback callback if all the other callbacks for this connection /* Fallback callback if all the other callbacks for this connection
don't match. */ don't match. */

7
http.c
View File

@ -2692,8 +2692,9 @@ evhttp_handle_request(struct evhttp_request *req, void *arg)
} }
if ((http->allowed_methods & req->type) == 0) { if ((http->allowed_methods & req->type) == 0) {
event_debug(("Rejecting disallowed method %d (allowed: %d)\n", req->type, http->allowed_methods)); event_debug(("Rejecting disallowed method %x (allowed: %x)\n",
evhttp_send_error(req, HTTP_BADMETHOD, NULL); (unsigned)req->type, (unsigned)http->allowed_methods));
evhttp_send_error(req, HTTP_NOTIMPLEMENTED, NULL);
return; return;
} }
@ -3020,7 +3021,7 @@ evhttp_set_max_body_size(struct evhttp* http, ev_ssize_t max_body_size)
} }
void void
evhttp_set_allowed_methods(struct evhttp* http, short methods) evhttp_set_allowed_methods(struct evhttp* http, ev_uint16_t methods)
{ {
http->allowed_methods = methods; http->allowed_methods = methods;
} }

18
include/event2/http.h
View File

@ -57,7 +57,9 @@ struct event_base;
#define HTTP_NOTMODIFIED 304 /**< page was not modified from last */ #define HTTP_NOTMODIFIED 304 /**< page was not modified from last */
#define HTTP_BADREQUEST 400 /**< invalid http request was made */ #define HTTP_BADREQUEST 400 /**< invalid http request was made */
#define HTTP_NOTFOUND 404 /**< could not find content for uri */ #define HTTP_NOTFOUND 404 /**< could not find content for uri */
#define HTTP_BADMETHOD 405 /**< method not allowed */ #define HTTP_BADMETHOD 405 /**< method not allowed for this uri */
#define HTTP_INTERNAL 500 /**< internal error */
#define HTTP_NOTIMPLEMENTED 501 /**< not implemented */
#define HTTP_SERVUNAVAIL 503 /**< the server is not available */ #define HTTP_SERVUNAVAIL 503 /**< the server is not available */
struct evhttp; struct evhttp;
@ -185,7 +187,9 @@ void evhttp_set_max_headers_size(struct evhttp* http, ev_ssize_t max_headers_siz
void evhttp_set_max_body_size(struct evhttp* http, ev_ssize_t max_body_size); void evhttp_set_max_body_size(struct evhttp* http, ev_ssize_t max_body_size);
/** /**
Sets the what HTTP methods are supported in requests accepted by this server. Sets the what HTTP methods are supported in requests accepted by this
server, and passed to user callbacks.
If not supported they will generate a "405 Method not allowed" response. If not supported they will generate a "405 Method not allowed" response.
By default this includes the following methods: GET, POST, HEAD, PUT, DELETE By default this includes the following methods: GET, POST, HEAD, PUT, DELETE
@ -193,7 +197,7 @@ void evhttp_set_max_body_size(struct evhttp* http, ev_ssize_t max_body_size);
@param http the http server on which to set the methods @param http the http server on which to set the methods
@param methods bit mask constructed from evhttp_cmd_type values @param methods bit mask constructed from evhttp_cmd_type values
*/ */
void evhttp_set_allowed_methods(struct evhttp* http, short methods); void evhttp_set_allowed_methods(struct evhttp* http, ev_uint16_t methods);
/** /**
Set a callback for a specified URI Set a callback for a specified URI
@ -339,7 +343,13 @@ void evhttp_send_reply_end(struct evhttp_request *req);
* Interfaces for making requests * Interfaces for making requests
*/ */
/** the different request types supported by evhttp */ /** The different request types supported by evhttp. These are as specified
* in RFC2616, except for PATCH which is specified by RFC5789.
*
* By default, only some of these methods are accepted and passed to user
* callbacks; use evhttp_set_allowed_methods() to change which methods
* are allowed.
*/
enum evhttp_cmd_type { enum evhttp_cmd_type {
EVHTTP_REQ_GET = 1 << 0, EVHTTP_REQ_GET = 1 << 0,
EVHTTP_REQ_POST = 1 << 1, EVHTTP_REQ_POST = 1 << 1,