Changeset 0b3bc05 in mod_gnutls

Timestamp:

Dec 2, 2004, 4:35:29 PM (15 years ago)

Author:

Paul Querna <chip@…>

Branches:

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

Children:

0314deb

Parents:

ed47098

Message:

setting proper ignores.
adding an empty cache files
trying to fix >16kb writes.

Files:

• include/memcache.h (added)
• src/gnutls_cache.c (added)
• src/gnutls_io.c (modified) (7 diffs)

src/gnutls_io.c

@@ -373 +373 @@
     return;
 #else
-ret = gnutls_handshake(ctxt->session);
+        ret = gnutls_handshake(ctxt->session);
         if (ret < 0) {
             if (ret == GNUTLS_E_WARNING_ALERT_RECEIVED
@@ -420 +420 @@
 
     if (ctxt->status < 0) {
-//        return ap_get_brigade(f->next, bb, mode, block, readbytes);
+        return ap_get_brigade(f->next, bb, mode, block, readbytes);
     }
 
@@ -486 +486 @@
     while (!APR_BRIGADE_EMPTY(bb)) {
         apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
-        if (APR_BUCKET_IS_EOS(bucket) || APR_BUCKET_IS_FLUSH(bucket)) {
-            /** TODO: GnuTLS doesn't have a special flush method? **/
+        if (APR_BUCKET_IS_EOS(bucket)) {
+
+            /* gnutls_bye(ctxt->session, GNUTLS_SHUT_RDWR); */
+
             if ((status = ap_pass_brigade(f->next, bb)) != APR_SUCCESS) {
                 return status;
             }
             break;
-        }
-        else if (AP_BUCKET_IS_EOC(bucket)) {
-            gnutls_bye(ctxt->session, GNUTLS_SHUT_WR);
+
+        } else if (APR_BUCKET_IS_FLUSH(bucket)) {
 
             if ((status = ap_pass_brigade(f->next, bb)) != APR_SUCCESS) {
@@ -500 +501 @@
             }
             break;
+
+        }
+        else if (AP_BUCKET_IS_EOC(bucket)) {
+
+            gnutls_bye(ctxt->session, GNUTLS_SHUT_WR);
+            gnutls_deinit(ctxt->session);
+            if ((status = ap_pass_brigade(f->next, bb)) != APR_SUCCESS) {
+                return status;
+            }
+            break;
+
         }
         else {
+
             /* filter output */
             const char *data;
@@ -519 +532 @@
             }
 
-            ret = gnutls_record_send(ctxt->session, data, len);
+            do {
+                ret = gnutls_record_send(ctxt->session, data, len);
+            }
+            while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
 
             if (ret < 0) {
@@ -532 +548 @@
             }
             else if ((apr_size_t) ret != len) {
+                //apr_bucket_split(bucket, ret);
+                //APR_BUCKET_REMOVE(bucket);
                 /* not all of the data was sent. */
                 /* mod_ssl basicly errors out here.. this doesn't seem right? */
@@ -539 +557 @@
                              " of %" APR_SIZE_T_FMT " bytes.",
                              len - (apr_size_t) ret, len);
+                //continue;
                 if (ctxt->output_rc == APR_SUCCESS) {
                     ctxt->output_rc = APR_EGENERAL;