From 34f28e08b3eda22033089c5ca72b5650fa38a21b Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 5 Nov 2009 15:57:22 +0000 Subject: [PATCH] Fix a few types to use compatible versions svn:r1501 --- bufferevent_openssl.c | 2 +- http-internal.h | 6 +++--- http.c | 18 ++++++++++++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c index b88a78aa..ba8e7f95 100644 --- a/bufferevent_openssl.c +++ b/bufferevent_openssl.c @@ -359,7 +359,7 @@ put_error(struct bufferevent_openssl *bev_ssl, unsigned long err) than 32 bits of it, since it needs to report errors on systems where long is only 32 bits. */ - bev_ssl->errors[bev_ssl->n_errors++] = (uint32_t) err; + bev_ssl->errors[bev_ssl->n_errors++] = (ev_uint32_t) err; } /* Have the base communications channel (either the underlying bufferevent or diff --git a/http-internal.h b/http-internal.h index 72a011b3..49ee9bcb 100644 --- a/http-internal.h +++ b/http-internal.h @@ -72,7 +72,7 @@ struct evhttp_connection { u_short port; size_t max_headers_size; - uint64_t max_body_size; + ev_uint64_t max_body_size; int flags; #define EVHTTP_CON_INCOMING 0x0001 /* only one request on it ever */ @@ -134,8 +134,8 @@ struct evhttp { int timeout; size_t default_max_headers_size; - size_t default_max_body_size; - + ev_uint64_t default_max_body_size; + void (*gencb)(struct evhttp_request *req, void *); void *gencbarg; diff --git a/http.c b/http.c index cf10692b..33990716 100644 --- a/http.c +++ b/http.c @@ -2672,12 +2672,22 @@ evhttp_set_timeout(struct evhttp* http, int timeout_in_secs) http->timeout = timeout_in_secs; } -void evhttp_set_max_headers_size(struct evhttp* http, ssize_t max_headers_size) { - http->default_max_headers_size = max_headers_size; +void +evhttp_set_max_headers_size(struct evhttp* http, ev_ssize_t max_headers_size) +{ + if (max_headers_size < 0) + http->default_max_headers_size = EV_SIZE_MAX; + else + http->default_max_headers_size = max_headers_size; } -void evhttp_set_max_body_size(struct evhttp* http, ssize_t max_body_size) { - http->default_max_body_size = max_body_size; +void +evhttp_set_max_body_size(struct evhttp* http, ev_ssize_t max_body_size) +{ + if (max_body_size < 0) + http->default_max_body_size = EV_UINT64_MAX; + else + http->default_max_body_size = max_body_size; } int -- 2.49.0