Changeset 0e13d67 in mod_gnutls

Timestamp:

Jun 13, 2009, 11:00:34 AM (11 years ago)

Author:

Nokis Mavrogiannopoulos <nmav@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream

Children:

7e67487

Parents:

7ef38d4

git-author:

Nikos Mavrogiannopoulos <nmav@…> (06/13/09 11:00:34)

git-committer:

Nokis Mavrogiannopoulos <nmav@…> (06/13/09 11:00:34)

Message:

do not try to send empty packs using TLS. This this has a special meaning and could result in clients closing connections.

File:

• src/gnutls_io.c (modified) (1 diff)

src/gnutls_io.c

@@ -588 +588 @@
                 break;
             }
-
-            do {
-                ret = gnutls_record_send(ctxt->session, data, len);
-            }
-            while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
-
-            if (ret < 0) {
-                /* error sending output */
-                ap_log_error(APLOG_MARK, APLOG_INFO, ctxt->output_rc,
+            
+            if (len > 0) {
+
+                do {
+                    ret = gnutls_record_send(ctxt->session, data, len);
+                }
+                while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
+
+                if (ret < 0) {
+                    /* error sending output */
+                    ap_log_error(APLOG_MARK, APLOG_INFO, ctxt->output_rc,
                              ctxt->c->base_server,
                              "GnuTLS: Error writing data."
                              " (%d) '%s'", (int)ret, gnutls_strerror(ret));
-                if (ctxt->output_rc == APR_SUCCESS) {
-                    ctxt->output_rc = APR_EGENERAL;
-                }
-            }
-            else if (ret != len) {
-                /* Not able to send the entire bucket, 
-                   split it and send it again. */
-                apr_bucket_split(bucket, ret);
+                    if (ctxt->output_rc == APR_SUCCESS) {
+                        ctxt->output_rc = APR_EGENERAL;
+                    }
+                }
+                else if (ret != len) {
+                    /* Not able to send the entire bucket, 
+                       split it and send it again. */
+                    apr_bucket_split(bucket, ret);
+                }
             }