~ubuntu-branches/ubuntu/trusty/serf/trusty-proposed

« back to all changes in this revision

Viewing changes to test/test_util.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2013-12-31 13:17:16 UTC
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: package-import@ubuntu.com-20131231131716-z7lpavv1il3sxb7g
Tags: upstream-1.3.3
ImportĀ upstreamĀ versionĀ 1.3.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
 
16
16
#include "apr.h"
17
17
#include "apr_pools.h"
 
18
#include <apr_strings.h>
 
19
 
18
20
#include <stdlib.h>
19
21
 
20
22
#include "serf.h"
27
29
/* Server setup function(s)
28
30
 */
29
31
 
30
 
#define SERV_URL "http://localhost:" SERV_PORT_STR
 
32
#define HTTP_SERV_URL  "http://localhost:" SERV_PORT_STR
 
33
#define HTTPS_SERV_URL "https://localhost:" SERV_PORT_STR
 
34
 
 
35
/* cleanup for conn */
 
36
static apr_status_t cleanup_conn(void *baton)
 
37
{
 
38
    serf_connection_t *conn = baton;
 
39
 
 
40
    serf_connection_close(conn);
 
41
 
 
42
    return APR_SUCCESS;
 
43
}
31
44
 
32
45
static apr_status_t default_server_address(apr_sockaddr_t **address,
33
46
                                           apr_pool_t *pool)
57
70
}
58
71
 
59
72
/* Default implementation of a serf_connection_setup_t callback. */
60
 
static apr_status_t default_conn_setup(apr_socket_t *skt,
61
 
                                       serf_bucket_t **input_bkt,
62
 
                                       serf_bucket_t **output_bkt,
63
 
                                       void *setup_baton,
64
 
                                       apr_pool_t *pool)
65
 
{
66
 
    test_baton_t *ctx = setup_baton;
67
 
 
68
 
    *input_bkt = serf_bucket_socket_create(skt, ctx->bkt_alloc);
69
 
    return APR_SUCCESS;
70
 
}
71
 
 
72
 
 
 
73
static apr_status_t default_http_conn_setup(apr_socket_t *skt,
 
74
                                            serf_bucket_t **input_bkt,
 
75
                                            serf_bucket_t **output_bkt,
 
76
                                            void *setup_baton,
 
77
                                            apr_pool_t *pool)
 
78
{
 
79
    test_baton_t *tb = setup_baton;
 
80
 
 
81
    *input_bkt = serf_bucket_socket_create(skt, tb->bkt_alloc);
 
82
    return APR_SUCCESS;
 
83
}
 
84
 
 
85
/* This function makes serf use SSL on the connection. */
 
86
apr_status_t default_https_conn_setup(apr_socket_t *skt,
 
87
                                      serf_bucket_t **input_bkt,
 
88
                                      serf_bucket_t **output_bkt,
 
89
                                      void *setup_baton,
 
90
                                      apr_pool_t *pool)
 
91
{
 
92
    test_baton_t *tb = setup_baton;
 
93
 
 
94
    *input_bkt = serf_bucket_socket_create(skt, tb->bkt_alloc);
 
95
    *input_bkt = serf_bucket_ssl_decrypt_create(*input_bkt, NULL,
 
96
                                                tb->bkt_alloc);
 
97
    tb->ssl_context = serf_bucket_ssl_encrypt_context_get(*input_bkt);
 
98
 
 
99
    if (output_bkt) {
 
100
        *output_bkt = serf_bucket_ssl_encrypt_create(*output_bkt,
 
101
                                                     tb->ssl_context,
 
102
                                                     tb->bkt_alloc);
 
103
    }
 
104
 
 
105
    if (tb->server_cert_cb)
 
106
        serf_ssl_server_cert_callback_set(tb->ssl_context,
 
107
                                          tb->server_cert_cb,
 
108
                                          tb);
 
109
 
 
110
    serf_ssl_set_hostname(tb->ssl_context, "localhost");
 
111
 
 
112
    return APR_SUCCESS;
 
113
}
 
114
 
 
115
apr_status_t use_new_connection(test_baton_t *tb,
 
116
                                apr_pool_t *pool)
 
117
{
 
118
    apr_uri_t url;
 
119
    apr_status_t status;
 
120
 
 
121
    if (tb->connection)
 
122
        cleanup_conn(tb->connection);
 
123
    tb->connection = NULL;
 
124
 
 
125
    status = apr_uri_parse(pool, tb->serv_url, &url);
 
126
    if (status != APR_SUCCESS)
 
127
        return status;
 
128
 
 
129
    status = serf_connection_create2(&tb->connection, tb->context,
 
130
                                     url,
 
131
                                     tb->conn_setup,
 
132
                                     tb,
 
133
                                     default_closed_connection,
 
134
                                     tb,
 
135
                                     pool);
 
136
    apr_pool_cleanup_register(pool, tb->connection, cleanup_conn,
 
137
                              apr_pool_cleanup_null);
 
138
 
 
139
    return status;
 
140
}
 
141
 
 
142
/* Setup the client context, ready to connect and send requests to a
 
143
   server.*/
73
144
static apr_status_t setup(test_baton_t **tb_p,
74
145
                          serf_connection_setup_t conn_setup,
 
146
                          const char *serv_url,
75
147
                          int use_proxy,
 
148
                          apr_size_t message_count,
76
149
                          apr_pool_t *pool)
77
150
{
 
151
    test_baton_t *tb;
78
152
    apr_status_t status;
79
 
    test_baton_t *tb;
80
 
    apr_uri_t url;
81
153
 
82
154
    tb = apr_pcalloc(pool, sizeof(*tb));
83
155
    *tb_p = tb;
86
158
    tb->context = serf_context_create(pool);
87
159
    tb->bkt_alloc = serf_bucket_allocator_create(pool, NULL, NULL);
88
160
 
 
161
    tb->accepted_requests = apr_array_make(pool, message_count, sizeof(int));
 
162
    tb->sent_requests = apr_array_make(pool, message_count, sizeof(int));
 
163
    tb->handled_requests = apr_array_make(pool, message_count, sizeof(int));
 
164
 
 
165
    tb->serv_url = serv_url;
 
166
    tb->conn_setup = conn_setup;
 
167
 
89
168
    status = default_server_address(&tb->serv_addr, pool);
90
169
    if (status != APR_SUCCESS)
91
170
        return status;
99
178
        serf_config_proxy(tb->context, tb->proxy_addr);
100
179
    }
101
180
 
102
 
    status = apr_uri_parse(pool, SERV_URL, &url);
103
 
    if (status != APR_SUCCESS)
104
 
        return status;
105
 
 
106
 
    status = serf_connection_create2(&tb->connection, tb->context,
107
 
                                     url,
108
 
                                     conn_setup ? conn_setup :
109
 
                                         default_conn_setup,
110
 
                                     tb,
111
 
                                     default_closed_connection,
112
 
                                     tb,
113
 
                                     pool);
114
 
 
115
 
    return status;
116
 
}
117
 
 
118
 
 
119
 
 
120
 
apr_status_t test_server_setup(test_baton_t **tb_p,
121
 
                               test_server_message_t *message_list,
122
 
                               apr_size_t message_count,
123
 
                               test_server_action_t *action_list,
124
 
                               apr_size_t action_count,
125
 
                               apr_int32_t options,
126
 
                               serf_connection_setup_t conn_setup,
127
 
                               apr_pool_t *pool)
128
 
{
129
 
    apr_status_t status;
130
 
    test_baton_t *tb;
131
 
 
132
 
    status = setup(tb_p,
133
 
                   conn_setup,
134
 
                   FALSE,
135
 
                   pool);
136
 
    if (status != APR_SUCCESS)
137
 
        return status;
138
 
 
139
 
    tb = *tb_p;
140
 
 
141
 
    /* Prepare a server. */
142
 
    status = test_start_server(&tb->serv_ctx, tb->serv_addr,
143
 
                               message_list, message_count,
144
 
                               action_list, action_count, options, pool);
145
 
 
146
 
    return status;
147
 
}
148
 
 
 
181
    status = use_new_connection(tb, pool);
 
182
 
 
183
    return status;
 
184
}
 
185
 
 
186
/* Setup an https server and the client context to connect to that server */
 
187
apr_status_t test_https_server_setup(test_baton_t **tb_p,
 
188
                                     test_server_message_t *message_list,
 
189
                                     apr_size_t message_count,
 
190
                                     test_server_action_t *action_list,
 
191
                                     apr_size_t action_count,
 
192
                                     apr_int32_t options,
 
193
                                     serf_connection_setup_t conn_setup,
 
194
                                     const char *keyfile,
 
195
                                     const char **certfiles,
 
196
                                     const char *client_cn,
 
197
                                     serf_ssl_need_server_cert_t server_cert_cb,
 
198
                                     apr_pool_t *pool)
 
199
{
 
200
    apr_status_t status;
 
201
    test_baton_t *tb;
 
202
 
 
203
    status = setup(tb_p,
 
204
                   conn_setup ? conn_setup : default_https_conn_setup,
 
205
                   HTTPS_SERV_URL,
 
206
                   FALSE,
 
207
                   message_count,
 
208
                   pool);
 
209
    if (status != APR_SUCCESS)
 
210
        return status;
 
211
 
 
212
    tb = *tb_p;
 
213
    tb->server_cert_cb = server_cert_cb;
 
214
 
 
215
    /* Prepare a server. */
 
216
    setup_https_test_server(&tb->serv_ctx, tb->serv_addr,
 
217
                            message_list, message_count,
 
218
                            action_list, action_count, options,
 
219
                            keyfile, certfiles, client_cn,
 
220
                            pool);
 
221
    status = start_test_server(tb->serv_ctx);
 
222
 
 
223
    return status;
 
224
}
 
225
 
 
226
/* Setup an http server and the client context to connect to that server */
 
227
apr_status_t test_http_server_setup(test_baton_t **tb_p,
 
228
                                    test_server_message_t *message_list,
 
229
                                    apr_size_t message_count,
 
230
                                    test_server_action_t *action_list,
 
231
                                    apr_size_t action_count,
 
232
                                    apr_int32_t options,
 
233
                                    serf_connection_setup_t conn_setup,
 
234
                                    apr_pool_t *pool)
 
235
{
 
236
    apr_status_t status;
 
237
    test_baton_t *tb;
 
238
 
 
239
    status = setup(tb_p,
 
240
                   conn_setup ? conn_setup : default_http_conn_setup,
 
241
                   HTTP_SERV_URL,
 
242
                   FALSE,
 
243
                   message_count,
 
244
                   pool);
 
245
    if (status != APR_SUCCESS)
 
246
        return status;
 
247
 
 
248
    tb = *tb_p;
 
249
 
 
250
    /* Prepare a server. */
 
251
    setup_test_server(&tb->serv_ctx, tb->serv_addr,
 
252
                      message_list, message_count,
 
253
                      action_list, action_count, options,
 
254
                      pool);
 
255
    status = start_test_server(tb->serv_ctx);
 
256
 
 
257
    return status;
 
258
}
 
259
 
 
260
/* Setup a proxy server and an http server and the client context to connect to
 
261
   that proxy server */
149
262
apr_status_t
150
263
test_server_proxy_setup(test_baton_t **tb_p,
151
264
                        test_server_message_t *serv_message_list,
164
277
    test_baton_t *tb;
165
278
 
166
279
    status = setup(tb_p,
167
 
                   conn_setup,
 
280
                   conn_setup ? conn_setup : default_http_conn_setup,
 
281
                   HTTP_SERV_URL,
168
282
                   TRUE,
 
283
                   serv_message_count,
169
284
                   pool);
170
285
    if (status != APR_SUCCESS)
171
286
        return status;
173
288
    tb = *tb_p;
174
289
 
175
290
    /* Prepare the server. */
176
 
    status = test_start_server(&tb->serv_ctx, tb->serv_addr,
177
 
                               serv_message_list, serv_message_count,
178
 
                               serv_action_list, serv_action_count,
179
 
                               options, pool);
 
291
    setup_test_server(&tb->serv_ctx, tb->serv_addr,
 
292
                      serv_message_list, serv_message_count,
 
293
                      serv_action_list, serv_action_count,
 
294
                      options,
 
295
                      pool);
 
296
    status = start_test_server(tb->serv_ctx);
180
297
    if (status != APR_SUCCESS)
181
298
        return status;
182
299
 
183
300
    /* Prepare the proxy. */
184
 
    status = test_start_server(&tb->proxy_ctx, tb->proxy_addr,
185
 
                               proxy_message_list, proxy_message_count,
186
 
                               proxy_action_list, proxy_action_count,
187
 
                               options, pool);
 
301
    setup_test_server(&tb->proxy_ctx, tb->proxy_addr,
 
302
                      proxy_message_list, proxy_message_count,
 
303
                      proxy_action_list, proxy_action_count,
 
304
                      options,
 
305
                      pool);
 
306
    status = start_test_server(tb->proxy_ctx);
188
307
 
189
308
    return status;
190
309
}
191
310
 
192
 
apr_status_t test_server_teardown(test_baton_t *tb, apr_pool_t *pool)
 
311
/* Setup a proxy server and a https server and the client context to connect to
 
312
   that proxy server */
 
313
apr_status_t
 
314
test_https_server_proxy_setup(test_baton_t **tb_p,
 
315
                              test_server_message_t *serv_message_list,
 
316
                              apr_size_t serv_message_count,
 
317
                              test_server_action_t *serv_action_list,
 
318
                              apr_size_t serv_action_count,
 
319
                              test_server_message_t *proxy_message_list,
 
320
                              apr_size_t proxy_message_count,
 
321
                              test_server_action_t *proxy_action_list,
 
322
                              apr_size_t proxy_action_count,
 
323
                              apr_int32_t options,
 
324
                              serf_connection_setup_t conn_setup,
 
325
                              const char *keyfile,
 
326
                              const char **certfiles,
 
327
                              const char *client_cn,
 
328
                              serf_ssl_need_server_cert_t server_cert_cb,
 
329
                              apr_pool_t *pool)
193
330
{
194
 
    serf_connection_close(tb->connection);
195
 
 
196
 
    if (tb->serv_ctx)
197
 
        test_server_destroy(tb->serv_ctx, pool);
198
 
    if (tb->proxy_ctx)
199
 
        test_server_destroy(tb->proxy_ctx, pool);
200
 
 
201
 
    return APR_SUCCESS;
 
331
    apr_status_t status;
 
332
    test_baton_t *tb;
 
333
 
 
334
    status = setup(tb_p,
 
335
                   conn_setup ? conn_setup : default_https_conn_setup,
 
336
                   HTTPS_SERV_URL,
 
337
                   TRUE, /* use proxy */
 
338
                   serv_message_count,
 
339
                   pool);
 
340
    if (status != APR_SUCCESS)
 
341
        return status;
 
342
 
 
343
    tb = *tb_p;
 
344
    tb->server_cert_cb = server_cert_cb;
 
345
 
 
346
    /* Prepare a https server. */
 
347
    setup_https_test_server(&tb->serv_ctx, tb->serv_addr,
 
348
                            serv_message_list, serv_message_count,
 
349
                            serv_action_list, serv_action_count,
 
350
                            options,
 
351
                            keyfile, certfiles, client_cn,
 
352
                            pool);
 
353
    status = start_test_server(tb->serv_ctx);
 
354
 
 
355
    /* Prepare the proxy. */
 
356
    setup_test_server(&tb->proxy_ctx, tb->proxy_addr,
 
357
                      proxy_message_list, proxy_message_count,
 
358
                      proxy_action_list, proxy_action_count,
 
359
                      options,
 
360
                      pool);
 
361
    status = start_test_server(tb->proxy_ctx);
 
362
 
 
363
    return status;
202
364
}
203
365
 
204
 
apr_pool_t *test_setup(void)
 
366
void *test_setup(void *dummy)
205
367
{
206
368
    apr_pool_t *test_pool;
207
369
    apr_pool_create(&test_pool, NULL);
208
370
    return test_pool;
209
371
}
210
372
 
211
 
void test_teardown(apr_pool_t *test_pool)
212
 
{
213
 
    apr_pool_destroy(test_pool);
 
373
void *test_teardown(void *baton)
 
374
{
 
375
    apr_pool_t *pool = baton;
 
376
    apr_pool_destroy(pool);
 
377
 
 
378
    return NULL;
 
379
}
 
380
 
 
381
/* Helper function, runs the client and server context loops and validates
 
382
 that no errors were encountered, and all messages were sent and received. */
 
383
apr_status_t
 
384
test_helper_run_requests_no_check(CuTest *tc, test_baton_t *tb,
 
385
                                  int num_requests,
 
386
                                  handler_baton_t handler_ctx[],
 
387
                                  apr_pool_t *pool)
 
388
{
 
389
    apr_pool_t *iter_pool;
 
390
    int i, done = 0;
 
391
    apr_status_t status;
 
392
 
 
393
    apr_pool_create(&iter_pool, pool);
 
394
 
 
395
    while (!done)
 
396
    {
 
397
        apr_pool_clear(iter_pool);
 
398
 
 
399
        /* run server event loop */
 
400
        status = run_test_server(tb->serv_ctx, 0, iter_pool);
 
401
        if (!APR_STATUS_IS_TIMEUP(status) &&
 
402
            SERF_BUCKET_READ_ERROR(status))
 
403
            return status;
 
404
 
 
405
        /* run proxy event loop */
 
406
        if (tb->proxy_ctx) {
 
407
            status = run_test_server(tb->proxy_ctx, 0, iter_pool);
 
408
            if (!APR_STATUS_IS_TIMEUP(status) &&
 
409
                SERF_BUCKET_READ_ERROR(status))
 
410
                return status;
 
411
        }
 
412
 
 
413
        /* run client event loop */
 
414
        status = serf_context_run(tb->context, 0, iter_pool);
 
415
        if (!APR_STATUS_IS_TIMEUP(status) &&
 
416
            SERF_BUCKET_READ_ERROR(status))
 
417
            return status;
 
418
 
 
419
        done = 1;
 
420
        for (i = 0; i < num_requests; i++)
 
421
            done &= handler_ctx[i].done;
 
422
    }
 
423
    apr_pool_destroy(iter_pool);
 
424
 
 
425
    return APR_SUCCESS;
 
426
}
 
427
 
 
428
void
 
429
test_helper_run_requests_expect_ok(CuTest *tc, test_baton_t *tb,
 
430
                                   int num_requests,
 
431
                                   handler_baton_t handler_ctx[],
 
432
                                   apr_pool_t *pool)
 
433
{
 
434
    apr_status_t status;
 
435
 
 
436
    status = test_helper_run_requests_no_check(tc, tb, num_requests,
 
437
                                               handler_ctx, pool);
 
438
    CuAssertIntEquals(tc, APR_SUCCESS, status);
 
439
 
 
440
    /* Check that all requests were received */
 
441
    CuAssertIntEquals(tc, num_requests, tb->sent_requests->nelts);
 
442
    CuAssertIntEquals(tc, num_requests, tb->accepted_requests->nelts);
 
443
    CuAssertIntEquals(tc, num_requests, tb->handled_requests->nelts);
 
444
}
 
445
 
 
446
serf_bucket_t* accept_response(serf_request_t *request,
 
447
                               serf_bucket_t *stream,
 
448
                               void *acceptor_baton,
 
449
                               apr_pool_t *pool)
 
450
{
 
451
    serf_bucket_t *c;
 
452
    serf_bucket_alloc_t *bkt_alloc;
 
453
    handler_baton_t *ctx = acceptor_baton;
 
454
    serf_bucket_t *response;
 
455
 
 
456
    /* get the per-request bucket allocator */
 
457
    bkt_alloc = serf_request_get_alloc(request);
 
458
 
 
459
    /* Create a barrier so the response doesn't eat us! */
 
460
    c = serf_bucket_barrier_create(stream, bkt_alloc);
 
461
 
 
462
    APR_ARRAY_PUSH(ctx->accepted_requests, int) = ctx->req_id;
 
463
 
 
464
    response = serf_bucket_response_create(c, bkt_alloc);
 
465
 
 
466
    if (strcasecmp(ctx->method, "HEAD") == 0)
 
467
      serf_bucket_response_set_head(response);
 
468
 
 
469
    return response;
 
470
}
 
471
 
 
472
apr_status_t setup_request(serf_request_t *request,
 
473
                           void *setup_baton,
 
474
                           serf_bucket_t **req_bkt,
 
475
                           serf_response_acceptor_t *acceptor,
 
476
                           void **acceptor_baton,
 
477
                           serf_response_handler_t *handler,
 
478
                           void **handler_baton,
 
479
                           apr_pool_t *pool)
 
480
{
 
481
    handler_baton_t *ctx = setup_baton;
 
482
    serf_bucket_t *body_bkt;
 
483
 
 
484
    if (ctx->request)
 
485
    {
 
486
        /* Create a raw request bucket. */
 
487
        *req_bkt = serf_bucket_simple_create(ctx->request, strlen(ctx->request),
 
488
                                             NULL, NULL,
 
489
                                             serf_request_get_alloc(request));
 
490
    }
 
491
    else
 
492
    {
 
493
        if (ctx->req_id >= 0) {
 
494
            /* create a simple body text */
 
495
            const char *str = apr_psprintf(pool, "%d", ctx->req_id);
 
496
 
 
497
            body_bkt = serf_bucket_simple_create(
 
498
                                        str, strlen(str), NULL, NULL,
 
499
                                        serf_request_get_alloc(request));
 
500
        }
 
501
        else
 
502
            body_bkt = NULL;
 
503
 
 
504
        *req_bkt =
 
505
        serf_request_bucket_request_create(request,
 
506
                                           ctx->method, ctx->path,
 
507
                                           body_bkt,
 
508
                                           serf_request_get_alloc(request));
 
509
    }
 
510
 
 
511
    APR_ARRAY_PUSH(ctx->sent_requests, int) = ctx->req_id;
 
512
 
 
513
    *acceptor = ctx->acceptor;
 
514
    *acceptor_baton = ctx;
 
515
    *handler = ctx->handler;
 
516
    *handler_baton = ctx;
 
517
 
 
518
    return APR_SUCCESS;
 
519
}
 
520
 
 
521
apr_status_t handle_response(serf_request_t *request,
 
522
                             serf_bucket_t *response,
 
523
                             void *handler_baton,
 
524
                             apr_pool_t *pool)
 
525
{
 
526
    handler_baton_t *ctx = handler_baton;
 
527
 
 
528
    if (! response) {
 
529
        serf_connection_request_create(ctx->tb->connection,
 
530
                                       setup_request,
 
531
                                       ctx);
 
532
        return APR_SUCCESS;
 
533
    }
 
534
 
 
535
    while (1) {
 
536
        apr_status_t status;
 
537
        const char *data;
 
538
        apr_size_t len;
 
539
 
 
540
        status = serf_bucket_read(response, 2048, &data, &len);
 
541
        if (SERF_BUCKET_READ_ERROR(status))
 
542
            return status;
 
543
 
 
544
        if (APR_STATUS_IS_EOF(status)) {
 
545
            APR_ARRAY_PUSH(ctx->handled_requests, int) = ctx->req_id;
 
546
            ctx->done = TRUE;
 
547
            return APR_EOF;
 
548
        }
 
549
 
 
550
        if (APR_STATUS_IS_EAGAIN(status)) {
 
551
            return status;
 
552
        }
 
553
 
 
554
    }
 
555
 
 
556
    return APR_SUCCESS;
 
557
}
 
558
 
 
559
void setup_handler(test_baton_t *tb, handler_baton_t *handler_ctx,
 
560
                   const char *method, const char *path,
 
561
                   int req_id,
 
562
                   serf_response_handler_t handler)
 
563
{
 
564
    handler_ctx->method = method;
 
565
    handler_ctx->path = path;
 
566
    handler_ctx->done = FALSE;
 
567
 
 
568
    handler_ctx->acceptor = accept_response;
 
569
    handler_ctx->acceptor_baton = NULL;
 
570
    handler_ctx->handler = handler ? handler : handle_response;
 
571
    handler_ctx->req_id = req_id;
 
572
    handler_ctx->accepted_requests = tb->accepted_requests;
 
573
    handler_ctx->sent_requests = tb->sent_requests;
 
574
    handler_ctx->handled_requests = tb->handled_requests;
 
575
    handler_ctx->tb = tb;
 
576
    handler_ctx->request = NULL;
 
577
}
 
578
 
 
579
void create_new_prio_request(test_baton_t *tb,
 
580
                             handler_baton_t *handler_ctx,
 
581
                             const char *method, const char *path,
 
582
                             int req_id)
 
583
{
 
584
    setup_handler(tb, handler_ctx, method, path, req_id, NULL);
 
585
    serf_connection_priority_request_create(tb->connection,
 
586
                                            setup_request,
 
587
                                            handler_ctx);
 
588
}
 
589
 
 
590
void create_new_request(test_baton_t *tb,
 
591
                        handler_baton_t *handler_ctx,
 
592
                        const char *method, const char *path,
 
593
                        int req_id)
 
594
{
 
595
    setup_handler(tb, handler_ctx, method, path, req_id, NULL);
 
596
    serf_connection_request_create(tb->connection,
 
597
                                   setup_request,
 
598
                                   handler_ctx);
 
599
}
 
600
 
 
601
void
 
602
create_new_request_with_resp_hdlr(test_baton_t *tb,
 
603
                                  handler_baton_t *handler_ctx,
 
604
                                  const char *method, const char *path,
 
605
                                  int req_id,
 
606
                                  serf_response_handler_t handler)
 
607
{
 
608
    setup_handler(tb, handler_ctx, method, path, req_id, handler);
 
609
    serf_connection_request_create(tb->connection,
 
610
                                   setup_request,
 
611
                                   handler_ctx);
214
612
}