← Back to branch summary

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

« back to all changes in this revision

Viewing changes to buckets/response_buckets.c

  • Committer: Bazaar Package Importer
  • Author(s): Peter Samuelson
  • Date: 2011-06-27 18:09:28 UTC
  • mfrom: (1.2.5 upstream)
  • mto: (3.3.1 sid)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: james.westby@ubuntu.com-20110627180928-ybwzd3hmx82nu3ir
Tags: 1.0.0~0+svn1514-1
* New upstream snapshot.
  - patches/abi-0.x: Remove as obsolete.
  - patches/kqueue: Forward-port.
  - Bump ABI: libserf0.7{,-dbg} -> libserf1{,-dbg}
  - patches/ip6-localhost: New patch: temporary (I hope) workaround for
    IPv4 / IPv6 confusion in testsuite.
* Implement Multi-Arch: same.
* libserf-dev Conflicts: libserf-0-0-dev, not Breaks.  Thanks, lintian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
buckets/response_buckets.c
109
109
    res = apr_date_checkmask(ctx->linebuf.line, "HTTP/#.# ###*");
110
110
    if (!res) {
111
111
        /* Not an HTTP response?  Well, at least we won't understand it. */
112
 
        return APR_EGENERAL;
 
112
        return SERF_ERROR_BAD_HTTP_RESPONSE;
113
113
    }
114
114
 
115
115
    ctx->sl.version = SERF_HTTP_VERSION(ctx->linebuf.line[5] - '0',
150
150
        end_key = c = memchr(ctx->linebuf.line, ':', ctx->linebuf.used);
151
151
        if (!c) {
152
152
            /* Bad headers? */
153
 
            return APR_EGENERAL;
 
153
            return SERF_ERROR_BAD_HTTP_RESPONSE;
154
154
        }
155
155
 
156
156
        /* Skip over initial ':' */
426
426
    serf_default_read_bucket,
427
427
    serf_response_peek,
428
428
    serf_response_destroy_and_data,
429
 
    serf_default_snapshot,
430
 
    serf_default_restore_snapshot,
431
 
    serf_default_is_snapshot_set,
432
429
};