Changeset 619c6bf in mod_gnutls for src/gnutls_io.c


Ignore:
Timestamp:
Jan 11, 2013, 12:58:18 AM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
2b1118c
Parents:
9c4a744 (diff), 17eb1a1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'upstream/0.5.9'

Upstream version 0.5.9

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_io.c

    r9c4a744 r619c6bf  
    556556        apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
    557557       
    558         if (AP_BUCKET_IS_EOC(bucket) || APR_BUCKET_IS_EOS(bucket)) {
    559             apr_bucket_brigade * tmpb;
    560            
    561             if (APR_BUCKET_IS_EOS(bucket)) {
    562                 tmpb = bb;
    563             } else {
    564                 tmpb = ctxt->output_bb;
    565             }
    566            
     558        if (AP_BUCKET_IS_EOC(bucket)) {
    567559            if (ctxt->session != NULL) {
    568560                do {
     
    574566            APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
    575567 
    576             if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) {
     568            if ((status = ap_pass_brigade(f->next, ctxt->output_bb)) != APR_SUCCESS) {
    577569                apr_brigade_cleanup(ctxt->output_bb);
    578570                return status;
     
    585577            }
    586578            continue;
    587         } else if (APR_BUCKET_IS_FLUSH(bucket)) {
     579        } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) {
    588580
    589581            apr_bucket_copy(bucket, &e);
Note: See TracChangeset for help on using the changeset viewer.