On the '1.3.x-r1901937' branch: Merge changes from the 1.3.x branch.
git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.3.x-r1901937@1909355 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/serf_bwtp.c b/test/serf_bwtp.c
index 3bdeb41..0ba822f 100644
--- a/test/serf_bwtp.c
+++ b/test/serf_bwtp.c
@@ -155,7 +155,6 @@
{
handler_baton_t *ctx = setup_baton;
serf_bucket_t *hdrs_bkt;
- serf_bucket_t *body_bkt;
if (ctx->req_body_path) {
apr_file_t *file;
@@ -168,12 +167,13 @@
printf("Error opening file (%s)\n", ctx->req_body_path);
return status;
}
-
+/*
body_bkt = serf_bucket_file_create(file,
serf_request_get_alloc(request));
+*/
}
else {
- body_bkt = NULL;
+/* body_bkt = NULL;*/
}
/*
@@ -371,18 +371,17 @@
if (APR_STATUS_IS_EOF(status)) {
int i;
serf_connection_t *conn;
- serf_request_t *new_req;
conn = serf_request_get_conn(request);
serf_connection_set_async_responses(conn,
accept_bwtp, ctx->acceptor_baton, handle_bwtp, NULL);
- new_req = serf_connection_request_create(conn, setup_channel, ctx);
+ serf_connection_request_create(conn, setup_channel, ctx);
for (i = 0; i < ctx->acceptor_baton->count; i++) {
- new_req = serf_connection_request_create(conn,
- setup_request,
- ctx);
+ serf_connection_request_create(conn,
+ setup_request,
+ ctx);
}
return APR_EOF;
@@ -445,11 +444,9 @@
apr_atomic_dec32(&ctx->requests_outstanding);
if (!ctx->requests_outstanding) {
serf_connection_t *conn;
- serf_request_t *new_req;
conn = serf_request_get_conn(request);
- new_req =
- serf_connection_request_create(conn, setup_close, ctx);
+ serf_connection_request_create(conn, setup_close, ctx);
}
return APR_EOF;
}
@@ -482,7 +479,6 @@
apr_sockaddr_t *address;
serf_context_t *context;
serf_connection_t *connection;
- serf_request_t *request;
app_baton_t app_ctx;
handler_baton_t handler_ctx;
apr_uri_t url;
@@ -607,8 +603,8 @@
handler_ctx.acceptor_baton = &app_ctx;
handler_ctx.handler = handle_response;
- request = serf_connection_request_create(connection, setup_bwtp_upgrade,
- &handler_ctx);
+ serf_connection_request_create(connection, setup_bwtp_upgrade,
+ &handler_ctx);
for (i = 0; i < app_ctx.count; i++) {
apr_atomic_inc32(&handler_ctx.requests_outstanding);
diff --git a/test/serf_get.c b/test/serf_get.c
index ec7b556..16a2fe0 100644
--- a/test/serf_get.c
+++ b/test/serf_get.c
@@ -420,7 +420,6 @@
serf_bucket_alloc_t *bkt_alloc;
serf_context_t *context;
serf_connection_t *connection;
- serf_request_t *request;
app_baton_t app_ctx;
handler_baton_t handler_ctx;
serf_bucket_t *req_hdrs = NULL;
@@ -652,8 +651,9 @@
serf_connection_set_max_outstanding_requests(connection, inflight);
for (i = 0; i < count; i++) {
- request = serf_connection_request_create(connection, setup_request,
- &handler_ctx);
+ /* We don't need the returned request here. */
+ serf_connection_request_create(connection, setup_request,
+ &handler_ctx);
}
while (1) {
diff --git a/test/serf_spider.c b/test/serf_spider.c
index 7d01cab..a815a64 100644
--- a/test/serf_spider.c
+++ b/test/serf_spider.c
@@ -329,10 +329,6 @@
}
if (ctx->app_ctx->using_ssl) {
- serf_bucket_alloc_t *req_alloc;
-
- req_alloc = serf_request_get_alloc(request);
-
if (ctx->app_ctx->ssl_ctx == NULL) {
*req_bkt = serf_bucket_ssl_encrypt_create(*req_bkt, NULL,
ctx->app_ctx->bkt_alloc);
@@ -632,8 +628,7 @@
app_baton_t app_ctx;
handler_baton_t *handler_ctx;
apr_uri_t url;
- const char *raw_url, *method;
- int count;
+ const char *raw_url;
apr_getopt_t *opt;
char opt_c;
char *authn = NULL;
@@ -652,11 +647,6 @@
apr_atomic_init(pool);
/* serf_initialize(); */
- /* Default to one round of fetching. */
- count = 1;
- /* Default to GET. */
- method = "GET";
-
apr_getopt_init(&opt, pool, argc, argv);
while ((status = apr_getopt(opt, "a:hv", &opt_c, &opt_arg)) ==
diff --git a/test/test_buckets.c b/test/test_buckets.c
index 0fc4e80..639fab9 100644
--- a/test/test_buckets.c
+++ b/test/test_buckets.c
@@ -1178,12 +1178,14 @@
!SERF_BUCKET_READ_ERROR(status));
errmsg = apr_psprintf(iter_pool,
"Read more data than expected, EAGAIN"
- " inserted at pos: %d, remainder: \"%s\"",
+ " inserted at pos: %" APR_SIZE_T_FMT
+ ", remainder: \"%s\"",
cut, fullmsg + cut);
CuAssert(tc, errmsg, strlen(ptr) >= len);
errmsg = apr_psprintf(iter_pool,
"Read data is not equal to expected, EAGAIN"
- " inserted at pos: %d, remainder: \"%s\"",
+ " inserted at pos: %" APR_SIZE_T_FMT
+ ", remainder: \"%s\"",
cut, fullmsg + cut);
CuAssertStrnEquals_Msg(tc, errmsg, ptr, len, data);
diff --git a/test/test_context.c b/test/test_context.c
index bbdb245..a8eb549 100644
--- a/test/test_context.c
+++ b/test/test_context.c
@@ -651,7 +651,6 @@
handler_baton_t handler_ctx[2];
const int num_requests = sizeof(handler_ctx)/sizeof(handler_ctx[0]);
int i;
- progress_baton_t *pb;
test_server_message_t message_list[] = {
{CHUNKED_REQUEST(1, "1")},
