← Back to branch summary

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

« back to all changes in this revision

Viewing changes to buckets/deflate_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/deflate_buckets.c
78
78
          | (((unsigned long)string[3]) << 24);
79
79
}
80
80
 
81
 
SERF_DECLARE(serf_bucket_t *) serf_bucket_deflate_create(
 
81
serf_bucket_t *serf_bucket_deflate_create(
82
82
    serf_bucket_t *stream,
83
83
    serf_bucket_alloc_t *allocator,
84
84
    int format)
121
121
{
122
122
    deflate_context_t *ctx = bucket->data;
123
123
 
 
124
    if (ctx->state > STATE_INIT &&
 
125
        ctx->state <= STATE_FINISH)
 
126
        inflateEnd(&ctx->zstream);
 
127
 
124
128
    /* We may have appended inflate_stream into the stream bucket.
125
129
     * If so, avoid free'ing it twice.
126
130
     */
360
364
#define serf_deflate_readline NULL
361
365
#define serf_deflate_peek NULL
362
366
 
363
 
SERF_DECLARE_DATA const serf_bucket_type_t serf_bucket_type_deflate = {
 
367
const serf_bucket_type_t serf_bucket_type_deflate = {
364
368
    "DEFLATE",
365
369
    serf_deflate_read,
366
370
    serf_deflate_readline,