- Timestamp:
- Jul 21, 2009, 4:46:13 PM (14 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream
- Children:
- 9085f5b
- Parents:
- daf3dc9
- git-author:
- Nikos Mavrogiannopoulos <nmav@…> (07/21/09 16:46:13)
- git-committer:
- Nokis Mavrogiannopoulos <nmav@…> (07/21/09 16:46:13)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_io.c
rdaf3dc9 rdcf1118 369 369 ret = gnutls_handshake(ctxt->session); 370 370 maxtries--; 371 } while ( ret == GNUTLS_E_AGAIN&& maxtries > 0);371 } while ((ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN) && maxtries > 0); 372 372 373 373 if (maxtries < 1) { … … 382 382 if (ctxt->session) { 383 383 gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 384 gnutls_error_to_alert( ret, NULL));384 gnutls_error_to_alert(GNUTLS_E_INTERNAL_ERROR, NULL)); 385 385 gnutls_deinit(ctxt->session); 386 386 } … … 548 548 while (!APR_BRIGADE_EMPTY(bb)) { 549 549 apr_bucket *bucket = APR_BRIGADE_FIRST(bb); 550 if (AP_BUCKET_IS_EOC(bucket)) { 550 551 if (AP_BUCKET_IS_EOC(bucket) || APR_BUCKET_IS_EOS(bucket)) { 552 apr_bucket_brigade * tmpb; 553 554 if (APR_BUCKET_IS_EOS(bucket)) { 555 tmpb = bb; 556 } else { 557 tmpb = ctxt->output_bb; 558 } 559 551 560 if (ctxt->session != NULL) { 552 561 do { … … 558 567 APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e); 559 568 560 if ((status = ap_pass_brigade(f->next, ctxt->output_bb)) != APR_SUCCESS) {569 if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) { 561 570 apr_brigade_cleanup(ctxt->output_bb); 562 571 return status; … … 569 578 } 570 579 continue; 571 572 } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) { 580 } else if (APR_BUCKET_IS_FLUSH(bucket)) { 573 581 574 582 apr_bucket_copy(bucket, &e);
Note: See TracChangeset
for help on using the changeset viewer.