Changeset dcf1118 in mod_gnutls for src

Timestamp:

Jul 21, 2009, 4:46:13 PM (14 years ago)

Author:

Nokis Mavrogiannopoulos <nmav@…>

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)

Message:

On connection termination be polite and send a bye (common handling of EOC and EOS).

File:

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

src/gnutls_io.c

@@ -369 +369 @@
         ret = gnutls_handshake(ctxt->session);
         maxtries--;
-    } while (ret == GNUTLS_E_AGAIN && maxtries > 0);
+    } while ((ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN) && maxtries > 0);
 
     if (maxtries < 1) {
@@ -382 +382 @@
         if (ctxt->session) {
             gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 
-                          gnutls_error_to_alert(ret, NULL));
+                          gnutls_error_to_alert(GNUTLS_E_INTERNAL_ERROR, NULL));
             gnutls_deinit(ctxt->session);
         }
@@ -548 +548 @@
     while (!APR_BRIGADE_EMPTY(bb)) {
         apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
-        if (AP_BUCKET_IS_EOC(bucket)) {
+        
+        if (AP_BUCKET_IS_EOC(bucket) || APR_BUCKET_IS_EOS(bucket)) {
+            apr_bucket_brigade * tmpb;
+            
+            if (APR_BUCKET_IS_EOS(bucket)) {
+                tmpb = bb;
+            } else {
+                tmpb = ctxt->output_bb;
+            }
+            
             if (ctxt->session != NULL) {
                 do {
@@ -558 +567 @@
             APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
             
-            if ((status = ap_pass_brigade(f->next, ctxt->output_bb)) != APR_SUCCESS) {
+            if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) {
                 apr_brigade_cleanup(ctxt->output_bb);
                 return status;
@@ -569 +578 @@
             }
             continue;
-
-        } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) {
+        } else if (APR_BUCKET_IS_FLUSH(bucket)) {
 
             apr_bucket_copy(bucket, &e);