Changeset 485d28e in mod_gnutls for src

Timestamp:

Sep 19, 2011, 10:25:46 PM (12 years ago)

Author:

Dash Shendy <neuromancer@…>

Branches:

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

Children:

bb24ee8

Parents:

cac3a7f

Message:

Major Legacy Code Cleanup

Location:

src

Files:

• Makefile.am (modified) (2 diffs)
• gnutls_cache.c (modified) (1 diff)
• gnutls_io.c (modified) (2 diffs)
• gnutls_lua.c (deleted)

src/Makefile.am

@@ -3 +3 @@
 libmod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c 
 #gnutls_lua.c
-libmod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS} ${LUA_CFLAGS}
-libmod_gnutls_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LIBS} ${LUA_LIBS}
+libmod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS}
+libmod_gnutls_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LIBS}
 
 lib_LTLIBRARIES = libmod_gnutls.la
@@ -23 +23 @@
         @echo ""
         @echo "   Please read the documentation at            "
-        @echo "   http://www.outoforder.cc/ for   "
+        @echo "   http://modgnutls.sourceforge.net/?p=docs for   "
         @echo "   details on configuration of this module     "
         @echo ""

src/gnutls_cache.c

@@ -221 +221 @@
         timeout = apr_time_sec(ctxt->sc->cache_timeout);
 
-        rv = apr_memcache_set(mc, strkey, data.data, data.size, timeout,
+        rv = apr_memcache_set(mc, strkey,(char *)data.data, data.size, timeout,
                               0);
 

src/gnutls_io.c

@@ -539 +539 @@
 }
 
+static ssize_t write_flush(mgs_handle_t * ctxt)
+{
+        apr_bucket *e;
+
+        if (!(ctxt->output_blen || ctxt->output_length)) {
+                ctxt->output_rc = APR_SUCCESS;
+                return 1;
+        }
+
+        if (ctxt->output_blen) {
+                e = apr_bucket_transient_create(ctxt->output_buffer,
+                                                ctxt->output_blen,
+                                                ctxt->output_bb->
+                                                bucket_alloc);
+                /* we filled this buffer first so add it to the
+ *               * head of the brigade
+ *                               */
+                APR_BRIGADE_INSERT_HEAD(ctxt->output_bb, e);
+                ctxt->output_blen = 0;
+        }
+
+        ctxt->output_length = 0;
+        e = apr_bucket_flush_create(ctxt->output_bb->bucket_alloc);
+        APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
+
+        ctxt->output_rc = ap_pass_brigade(ctxt->output_filter->next,
+                                          ctxt->output_bb);
+        /* clear the brigade to be ready for next time */
+        apr_brigade_cleanup(ctxt->output_bb);
+
+        return (ctxt->output_rc == APR_SUCCESS) ? 1 : -1;
+}
+
 apr_status_t mgs_filter_output(ap_filter_t * f, apr_bucket_brigade * bb)
 {
@@ -742 +775 @@
 }
 
-
-static ssize_t write_flush(mgs_handle_t * ctxt)
-{
-        apr_bucket *e;
-
-        if (!(ctxt->output_blen || ctxt->output_length)) {
-                ctxt->output_rc = APR_SUCCESS;
-                return 1;
-        }
-
-        if (ctxt->output_blen) {
-                e = apr_bucket_transient_create(ctxt->output_buffer,
-                                                ctxt->output_blen,
-                                                ctxt->output_bb->
-                                                bucket_alloc);
-                /* we filled this buffer first so add it to the
-                 * head of the brigade
-                 */
-                APR_BRIGADE_INSERT_HEAD(ctxt->output_bb, e);
-                ctxt->output_blen = 0;
-        }
-
-        ctxt->output_length = 0;
-        e = apr_bucket_flush_create(ctxt->output_bb->bucket_alloc);
-        APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
-
-        ctxt->output_rc = ap_pass_brigade(ctxt->output_filter->next,
-                                          ctxt->output_bb);
-        /* clear the brigade to be ready for next time */
-        apr_brigade_cleanup(ctxt->output_bb);
-
-        return (ctxt->output_rc == APR_SUCCESS) ? 1 : -1;
-}
-
 ssize_t mgs_transport_write(gnutls_transport_ptr_t ptr,
                             const void *buffer, size_t len)