Changeset a66e147 in mod_gnutls for src/gnutls_io.c

Timestamp:

Dec 10, 2004, 1:08:52 AM (16 years ago)

Author:

Paul Querna <chip@…>

Branches:

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

Children:

95ca7c0

Parents:

76bd3bf

Message:

working support for a ssl session cache via memcached.

File:

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

src/gnutls_io.c

@@ -274 +274 @@
             else {
                 /* Some Other Error. Report it. Die. */
-                ap_log_error(APLOG_MARK, APLOG_INFO, ctxt->input_rc,
-                             ctxt->c->base_server,
-                             "GnuTLS: Error reading data. (%d) '%s'", rc,
-                             gnutls_strerror(rc));
+                if(gnutls_error_is_fatal(rc)) {
+                    ap_log_error(APLOG_MARK, APLOG_INFO, ctxt->input_rc,
+                                 ctxt->c->base_server,
+                                 "GnuTLS: Error reading data. (%d) '%s'", rc,
+                                 gnutls_strerror(rc));
+                }
+                else if(*len > 0) {
+                    ctxt->input_rc = APR_SUCCESS;
+                    break;
+                }
             }
 
@@ -450 +456 @@
     while (!APR_BRIGADE_EMPTY(bb)) {
         apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
-        if (APR_BUCKET_IS_EOS(bucket)) {
-
-            /* gnutls_bye(ctxt->session, GNUTLS_SHUT_RDWR); */
+        if (APR_BUCKET_IS_EOS(bucket) || 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) {
@@ -465 +472 @@
             }
             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 {