Changeset 9a9bc1e in mod_gnutls for src

Timestamp:

Sep 25, 2011, 8:13:55 PM (11 years ago)

Author:

Dash Shendy <neuromancer@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, msva, proxy-ticket, upstream

Children:

84e07cc

Parents:

7e92bbb

Message:

Added fix for unclean shutdowns, we're now ignoring SIGPIPE Signals

File:

• src/gnutls_io.c (modified) (5 diffs)

src/gnutls_io.c

@@ -569 +569 @@
     apr_read_type_e rblock = APR_NONBLOCK_READ;
 
+    /* Block SIGPIPE Signals */
+    status = apr_signal_block(SIGPIPE); 
+    if(status != APR_SUCCESS) {
+        /* error sending output */
+        ap_log_error(APLOG_MARK,APLOG_INFO,ctxt->output_rc,ctxt->c->base_server,
+                "GnuTLS: Error Blocking SIGPIPE Signal!");        
+        return status;
+    }
+    
     if (f->c->aborted) {
         apr_brigade_cleanup(bb);
@@ -587 +596 @@
         if (APR_BUCKET_IS_EOS(bucket)) {
             return ap_pass_brigade(f->next, bb);
-        } else if (APR_BUCKET_IS_FLUSH(bucket)) {
+        } else if (APR_BUCKET_IS_FLUSH(bucket)) {       
             /* Try Flush */
             if (write_flush(ctxt) < 0) {
@@ -594 +603 @@
             }
             /* cleanup! */
-            apr_bucket_delete(bucket);
+            apr_bucket_delete(bucket);                
         } else if (AP_BUCKET_IS_EOC(bucket)) {
             /* End Of Connection */
@@ -600 +609 @@
                 /* Try A Clean Shutdown */
                 do {
-                    ret = gnutls_bye(ctxt->session,
-                            GNUTLS_SHUT_WR);
-                } while (ret == GNUTLS_E_INTERRUPTED ||
-                        ret == GNUTLS_E_AGAIN);
+                    ret = gnutls_bye(ctxt->session, GNUTLS_SHUT_WR);
+                } while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
                 /* De-Initialize Session */
                 gnutls_deinit(ctxt->session);
                 ctxt->session = NULL;
             }
+            /* cleanup! */
+            apr_bucket_delete(bucket);            
             /* Pass next brigade! */
             return ap_pass_brigade(f->next, bb);
@@ -615 +624 @@
             apr_size_t len;
 
-            status =
-                    apr_bucket_read(bucket, &data, &len, rblock);
+            status = apr_bucket_read(bucket, &data, &len, rblock);
 
             if (APR_STATUS_IS_EAGAIN(status)) {