aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gnutls_io.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gnutls_io.c b/src/gnutls_io.c
index 65e128d..b06afd7 100644
--- a/src/gnutls_io.c
+++ b/src/gnutls_io.c
@@ -381,7 +381,8 @@ tryagain:
381#endif 381#endif
382 gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 382 gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
383 gnutls_error_to_alert(ret, NULL)); 383 gnutls_error_to_alert(ret, NULL));
384 gnutls_deinit(ctxt->session); 384 if (ctxt->session) gnutls_deinit(ctxt->session);
385 ctxt->session = NULL;
385 return -1; 386 return -1;
386 } 387 }
387 388
@@ -412,7 +413,8 @@ tryagain:
412 ctxt->status = -1; 413 ctxt->status = -1;
413 gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 414 gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
414 gnutls_error_to_alert(ret, NULL)); 415 gnutls_error_to_alert(ret, NULL));
415 gnutls_deinit(ctxt->session); 416 if (ctxt->session) gnutls_deinit(ctxt->session);
417 ctxt->session = NULL;
416 return ret; 418 return ret;
417 } 419 }
418 else { 420 else {
@@ -555,7 +557,8 @@ apr_status_t mgs_filter_output(ap_filter_t * f,
555 } 557 }
556 558
557 apr_brigade_cleanup(ctxt->output_bb); 559 apr_brigade_cleanup(ctxt->output_bb);
558 gnutls_deinit(ctxt->session); 560 if (ctxt->session) gnutls_deinit(ctxt->session);
561 ctxt->session = NULL;
559 continue; 562 continue;
560 563
561 } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) { 564 } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) {
lass='commitgraph'>| | | | and could result in clients closing connections. * if private key import fails try as pkcs8 key.Gravatar Nokis Mavrogiannopoulos 2009-05-21 | * removed limit on ca certificates' numberGravatar Nokis Mavrogiannopoulos 2009-01-24 | * bumped version and updated the detection script to work with pkg-config.0.5.4Gravatar Nokis Mavrogiannopoulos 2009-01-04 | * Added patch to fix issue with mod_proxy. Investigation and patch by Alain Knaff.Gravatar Nokis Mavrogiannopoulos 2009-01-04 | | | | | | | | | | | | | It seems that the reason for this behavior is that the mgs_hook_pre_connection is being called both for incoming and outgoing (mod_proxy) connections. The attached patch (mod_proxy.patch) tries to find out in which case we are, and returns OK without doing anything if it is an outgoing connection. The method of telling both cases apart (namely, checking whether remote address' hostname is set) may seem somewhat hackish, but it does work, even if HostnameLookups is set to On. If ever there is a problem with this method, we might need to check local port instead (whether it is 443), but that would break if a non-standard https port was used. * APLOG_EMERG was replaced with APLOG_STARTUP for startup messages.Gravatar Nokis Mavrogiannopoulos 2008-11-02 | * modified definition to extern to avoid compilation errors in darwin.Gravatar Nokis Mavrogiannopoulos 2008-10-19 | * (no commit message)Gravatar Nokis Mavrogiannopoulos 2008-10-16 | * (no commit message)