Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2012-07-25 16:06:51 -04:00
commit 6fdbf3a2bc
2 changed files with 1 additions and 3 deletions

View File

@ -1223,6 +1223,7 @@ test_getaddrinfo_async(void *arg)
tt_assert(! evdns_base_set_option(dns_base, "getaddrinfo-allow-skew", "0.2"));
memset(a_out, 0, sizeof(a_out));
memset(&local_outcome, 0, sizeof(local_outcome));
n_gai_results_pending = 10000; /* don't think about exiting yet. */

View File

@ -892,7 +892,6 @@ http_connection_test_(struct basic_test_data *data, int persistent)
/* We give ownership of the request to the connection */
if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
tt_abort_msg("Couldn't make request");
exit(1);
}
event_base_dispatch(data->base);
@ -1001,7 +1000,6 @@ http_connection_async_test(void *arg)
/* We give ownership of the request to the connection */
if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
tt_abort_msg("Couldn't make request");
exit(1);
}
event_base_dispatch(data->base);
@ -1849,7 +1847,6 @@ http_close_detection_(struct basic_test_data *data, int with_delay)
if (evhttp_make_request(evcon,
req, EVHTTP_REQ_GET, with_delay ? "/largedelay" : "/test") == -1) {
tt_abort_msg("couldn't make request");
exit(1);
}
event_base_dispatch(data->base);