From 1d48b0afe250a827ba32b3ecfdc8c08032651863 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos
Date: Mon, 20 Jul 2009 21:14:37 +0000
Subject: More fixes related to bug #102

---
 src/gnutls_io.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/gnutls_io.c b/src/gnutls_io.c
index a8fd242..e145466 100644
--- a/src/gnutls_io.c
+++ b/src/gnutls_io.c
@@ -379,9 +379,11 @@ tryagain:
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctxt->c->base_server,
                      "GnuTLS: Handshake Failed. Hit Maximum Attempts");
 #endif
-        gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 
+        if (ctxt->session) {
+            gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 
                           gnutls_error_to_alert(ret, NULL));
-        if (ctxt->session) gnutls_deinit(ctxt->session);
+            gnutls_deinit(ctxt->session);
+        }
         ctxt->session = NULL;
         return -1;
     }
@@ -411,9 +413,11 @@ tryagain:
                      gnutls_strerror(ret));
 #endif
         ctxt->status = -1;
-        gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 
+        if (ctxt->session) {
+            gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 
                           gnutls_error_to_alert(ret, NULL));
-        if (ctxt->session) gnutls_deinit(ctxt->session);
+            gnutls_deinit(ctxt->session);
+        }
         ctxt->session = NULL;
         return ret;
     }
@@ -559,8 +563,10 @@ apr_status_t mgs_filter_output(ap_filter_t * f,
             }
 
             apr_brigade_cleanup(ctxt->output_bb);
-            if (ctxt->session) gnutls_deinit(ctxt->session);
-            ctxt->session = NULL;
+            if (APR_BUCKET_IS_EOS(bucket) && ctxt->session) {
+                gnutls_deinit(ctxt->session);
+                ctxt->session = NULL;
+            }
             continue;
 
         } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) {
-- 
cgit 

e='id' value='771ca63efe669f8b0a3ffaeba1f3be7e3688b35f'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/httpd/mod_gnutls/log/?h=0.5.1&amp;id=771ca63efe669f8b0a3ffaeba1f3be7e3688b35f'>Collapse</a>)</th><th class='left'>Author</th><th class='left'>Age</th></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=771ca63efe669f8b0a3ffaeba1f3be7e3688b35f'>The GnuTLSCache variable now can be given the specific</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-09-23 09:35:27 +0200'>2010-09-23</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> 
<span class='column1'>|</span> 
<span class='column1'>|</span> 
<span class='column1'>|</span> 
<span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
option "sdbm" instead of "dbm". "dbm" will use the default
dbm type of libapr while sdbm will force sdbm to be used.


</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=0fce7c2dd90a0d5214be02a09bf694c7cd0289aa'>bumped version</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-09-23 09:15:16 +0200'>2010-09-23</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=7ce01c9c9325468b6ed85ba64a9899d12cfe0fa0'>Corrected behavior in Keep-Alive connections (do not</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-09-22 08:05:48 +0200'>2010-09-22</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> 
<span class='column1'>|</span> 
<span class='column1'>|</span> 
<span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
terminate the connection prematurely)


</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=41dd507c65c56bc88d73f8080efe4febdf1016e1'>Released 0.5.8.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-08-18 20:44:12 +0200'>2010-08-18</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=368b5740dd89c160645548b3a608e032d1d39160'>Safer usage of session variable to prevent segmentation faults on closure. ↵</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-08-18 20:41:36 +0200'>2010-08-18</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> 
<span class='column1'>|</span> 
<span class='column1'>|</span> 
<span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
Should solve issue #106.


</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=7fec961893adf880d4acc3da171031829f93af86'>Depend on libgnutls for the activation and expiration time checks.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-07-02 15:15:52 +0200'>2010-07-02</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=bca274dac7a2a80606b015c944eed027330108ca'>Session tickets are enabled by default.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-07-02 15:04:15 +0200'>2010-07-02</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=ae233c2446cd31680dd53616ab8882427e861ebc'>Added option to turn on/off session tickets.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-07-01 03:09:56 +0200'>2010-07-01</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=7b3e5de119e3a435c062d48295a227a3ff673f24'>Released 0.5.7.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-07-01 02:55:00 +0200'>2010-07-01</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=03a9a6b874ae291720e6089c2cf892a3e0ede4d3'>Force SDBM.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-07-01 02:47:51 +0200'>2010-07-01</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=3928f79a358f10de421ad015ce11679291ccf4c6'>More libgcrypt fixes.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-06-30 22:18:48 +0200'>2010-06-30</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=f10ab4fd830c473b789e9833566d0d88825b6a39'>Added missing var.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-06-30 21:28:55 +0200'>2010-06-30</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=049954083c6beefa282ea8ea5a444070aab15076'>Use libgcrypt calls only if gnutls is older than 2.11.0</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-06-30 20:16:35 +0200'>2010-06-30</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=4deda6d05d70cf67986636b76abfe54d5135eb83'>added more text on session tickets</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-06-27 21:24:01 +0200'>2010-06-27</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=2b29da0c2ea26907c964bef179337a2cc614a22c'>Check the cache DB every 15 minutes instead of checking on every write.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-06-27 21:13:18 +0200'>2010-06-27</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=622abdd12b5c31c2d506d710456bebd6bfff8603'>open the database as readonly when fetching.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-06-27 21:06:15 +0200'>2010-06-27</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=8e9851831c54876248c0d11845bfb41e8648d177'>properly initialize variable.</a></td><td><img src='//www.gravatar.com/avatar/aedca57113b6770dff365718ebff9034?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nikos Mavrogiannopoulos
</td><td><span title='2010-06-27 20:10:12 +0200'>2010-06-27</span></td></tr>
<tr class='nohover-highlight'><td class='commitgraph'><span class='column1'>|</span> </td>
<td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td class='commitgraph'>* </td><td class='logsubject'><a href='/httpd/mod_gnutls/commit/?h=0.5.1&amp;id=ed07ddf72b4e586626d1c290edde4c49854dbb4a'>Added support for session tickets.</a></td><td>