← Back to branch summary

~ubuntu-branches/ubuntu/trusty/serf/trusty-security

« back to all changes in this revision

Viewing changes to buckets/barrier_buckets.c

  • Committer: Bazaar Package Importer
  • Author(s): Peter Samuelson
  • Date: 2011-06-03 03:18:07 UTC
  • mfrom: (1.2.4 upstream)
  • mto: (3.3.1 sid)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: james.westby@ubuntu.com-20110603031807-3vq82t5lzw692our
Tags: 0.7.2-1
* New upstream release.
  - patches/no-export-vars: delete, now upstream.
* New ABI:
  - patches/abi-0.x: New patch to change upstream SONAME.
  - Rename libserf-0-0 to libserf0.7.
  - Rename libserf-0-0-dev to libserf-dev while we're at it.
* Policy 3.9.1: one instance of s/Conflicts/Breaks/.
* "Upgrade" to source format 1.0.
* Add some Depends: ${misc:Depends}; thanks, Lintian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
buckets/barrier_buckets.c
24
24
} barrier_context_t;
25
25
 
26
26
 
27
 
SERF_DECLARE(serf_bucket_t *) serf_bucket_barrier_create(
 
27
serf_bucket_t *serf_bucket_barrier_create(
28
28
    serf_bucket_t *stream,
29
29
    serf_bucket_alloc_t *allocator)
30
30
{
45
45
    return serf_bucket_read(ctx->stream, requested, data, len);
46
46
}
47
47
 
 
48
static apr_status_t serf_barrier_read_iovec(serf_bucket_t *bucket,
 
49
                                            apr_size_t requested,
 
50
                                            int vecs_size, struct iovec *vecs,
 
51
                                            int *vecs_used)
 
52
{
 
53
    barrier_context_t *ctx = bucket->data;
 
54
 
 
55
    return serf_bucket_read_iovec(ctx->stream, requested, vecs_size, vecs,
 
56
                                  vecs_used);
 
57
}
 
58
 
48
59
static apr_status_t serf_barrier_readline(serf_bucket_t *bucket,
49
60
                                         int acceptable, int *found,
50
61
                                         const char **data, apr_size_t *len)
74
85
    serf_default_destroy_and_data(bucket);
75
86
}
76
87
 
77
 
SERF_DECLARE_DATA const serf_bucket_type_t serf_bucket_type_barrier = {
 
88
const serf_bucket_type_t serf_bucket_type_barrier = {
78
89
    "BARRIER",
79
90
    serf_barrier_read,
80
91
    serf_barrier_readline,
81
 
    serf_default_read_iovec,
 
92
    serf_barrier_read_iovec,
82
93
    serf_default_read_for_sendfile,
83
94
    serf_default_read_bucket,
84
95
    serf_barrier_peek,