Changeset 1503

Timestamp:

01/06/2007 06:59:03 AM (20 months ago)

Author:

jakabosky

Message:

fixed bugs in mod_chunked, Mostly just code cleanup.
Added mod_deflate, ported from patch for lighttpd 1.4.13
Content-Length header is removed from backend response and re-generated
since mod_deflate will change the length.

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/filter.c (modified) (1 diff)
• src/filter.h (modified) (1 diff)
• src/mod_chunked.c (modified) (6 diffs)
• src/mod_deflate.c (added)
• src/mod_proxy_core.c (modified) (1 diff)
• src/plugin.c (modified) (2 diffs)
• src/response.c (modified) (2 diffs)

trunk/configure.in

@@ -569 +569 @@
 
 
-do_build="mod_proxy_core mod_proxy_backend_http mod_proxy_backend_fastcgi mod_proxy_backend_scgi mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfiles mod_userdir mod_webdav mod_staticfile mod_chunked mod_flv_streaming" 
+do_build="mod_proxy_core mod_proxy_backend_http mod_proxy_backend_fastcgi mod_proxy_backend_scgi mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfiles mod_userdir mod_webdav mod_staticfile mod_deflate mod_chunked mod_flv_streaming" 
 
 plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"

trunk/src/Makefile.am

@@ -141 +141 @@
 mod_staticfile_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_staticfile_la_LIBADD = $(common_libadd)
+
+lib_LTLIBRARIES += mod_deflate.la
+mod_deflate_la_SOURCES = mod_deflate.c 
+mod_deflate_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_deflate_la_LIBADD = $(Z_LIB) $(BZ_LIB) $(common_libadd)
 
 lib_LTLIBRARIES += mod_chunked.la

trunk/src/filter.c

@@ -127 +127 @@
 }
 
+void filter_chain_remove_filter(filter_chain *chain, filter *fl) {
+        if (!chain || !fl) return;
+
+        if (chain->first == fl) {
+                chain->first = fl->next;
+        }
+        if (chain->last == fl) {
+                chain->last = fl->prev;
+        }
+        filter_free(fl);
+}
+
 int filter_chain_copy_output(filter_chain *chain, chunkqueue *out) {
         int total;

trunk/src/filter.h

@@ -36 +36 @@
 filter *filter_chain_create_filter(filter_chain *chain, int id);
 filter *filter_chain_get_filter(filter_chain *chain, int id);
+void filter_chain_remove_filter(filter_chain *chain, filter *fl);
 
 int filter_chain_copy_output(filter_chain *chain, chunkqueue *out);

trunk/src/mod_chunked.c

@@ -40 +40 @@
 
 typedef struct {
-        unsigned short is_chunked;
         unsigned short debug;
+        filter *fl;
 } handler_ctx;
 
@@ -48 +48 @@
 
         hctx = calloc(1, sizeof(*hctx));
-        hctx->is_chunked = 0;
         hctx->debug = 0;
+        hctx->fl = NULL;
 
         return hctx;
@@ -179 +179 @@
         plugin_data *p = p_d;
         handler_ctx *hctx;
-        int need_length = 0;
+        filter *fl;
+        chunkqueue *in;
+        int use_chunked = 0;
 
         mod_chunked_patch_connection(srv, con, p);
 
-        hctx = handler_ctx_init();
-        hctx->is_chunked = 0;
-        hctx->debug = p->conf.debug;
-        con->plugin_ctx[p->id] = hctx;
-
-        if (!con->send->is_closed &&
-                        NULL == array_get_element(con->response.headers, "Content-Length")) {
+        /* get filter. */
+        fl = filter_chain_get_filter(con->send_filters, p->id);
+        if (!fl) {
+                if (p->conf.debug > 0) TRACE("%s", "add chunked filter to filter chain");
+                fl = filter_chain_create_filter(con->send_filters, p->id);
+        }
+        /* get our input and output chunkqueues. */
+        if (!fl || !fl->prev) {
+                filter_chain_remove_filter(con->send_filters, fl);
+                return HANDLER_GO_ON;
+        }
+        in = fl->prev->cq;
+
+        /* check if response needs chunked encoding. */
+        if(in->is_closed) {
+                if (p->conf.debug > 0) TRACE("%s", "response content finished disable chunked encoding");
+                con->response.content_length = chunkqueue_length(in);
+                use_chunked = 0;
+        } else {
                 /* we don't know the size of the content yet
                  * - either enable chunking
@@ -195 +209 @@
 
                 if (con->request.http_version == HTTP_VERSION_1_1 && p->conf.encoding) {
-                        /* enable chunk-encoding */
-                        con->response.transfer_encoding |= HTTP_TRANSFER_ENCODING_CHUNKED;
+                        use_chunked = 1;
                 } else {
-                        con->response.transfer_encoding &= ~HTTP_TRANSFER_ENCODING_CHUNKED;
+                        if (p->conf.debug > 0)
+                                TRACE("%s", "content length unknown and can't use chunked encoding.  disable keep-alive");
                         con->keep_alive = 0;
-                }
-        }
-
-        /* check if Content-Length header is needed. */
-        if ((con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) == 0 &&
-            NULL == array_get_element(con->response.headers, "Content-Length")) {
-                need_length = 1;
-        }
-        if (con->send->is_closed) {
-                /* we have all the content and chunked encoding is not used, set a content-length */
-
-                if (need_length) {
-                        buffer_copy_off_t(srv->tmp_buf, chunkqueue_length(con->send));
-
-                        response_header_overwrite(srv, con, CONST_STR_LEN("Content-Length"), CONST_BUF_LEN(srv->tmp_buf));
-                }
-        } else if (need_length) {
-                /* we don't know the size of the content yet and chunked encoding is disabled.
-                 * - disable keep-alive  */
-                con->keep_alive = 0;
-        }
-
-        /* check if another module requested chunk-encoding. */
-        hctx->is_chunked = (con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED);
-        if (hctx->debug > 0) TRACE("is_chunked=%d", hctx->is_chunked);
+                        use_chunked = 0;
+                }
+        }
+
+        if (!use_chunked) {
+                /* chunked encoding disabled.  remove filter */
+                con->response.transfer_encoding &= ~HTTP_TRANSFER_ENCODING_CHUNKED;
+                filter_chain_remove_filter(con->send_filters, fl);
+                return HANDLER_GO_ON;
+        }
+
+        /* enable chunked encoding */
+        con->response.transfer_encoding |= HTTP_TRANSFER_ENCODING_CHUNKED;
+        hctx = handler_ctx_init();
+        hctx->debug = p->conf.debug;
+        con->plugin_ctx[p->id] = hctx;
+        hctx->fl = fl;
+
+        if (hctx->debug > 0)
+                TRACE("%s", "chunked encoding enabled");
 
         return HANDLER_GO_ON;
@@ -268 +277 @@
         plugin_data *p = p_d;
         handler_ctx *hctx = con->plugin_ctx[p->id];
-        filter *fl;
         chunkqueue *in;
         chunkqueue *out;
@@ -276 +284 @@
         UNUSED(srv);
 
+        /* check if chunk-encoding is enabled. */
         if (!hctx) return HANDLER_GO_ON;
 
-        /* check if chunk-encoding is enabled. */
-        if (0 == hctx->is_chunked) return HANDLER_GO_ON;
-
-        /* get filter. */
-        fl = filter_chain_get_filter(con->send_filters, p->id);
-        if (!fl) {
-                if (hctx->debug > 0) TRACE("%s", "add chunked filter to filter chain");
-                fl = filter_chain_create_filter(con->send_filters, p->id);
-        }
         /* get our input and output chunkqueues. */
-        if (!fl || !fl->prev) return HANDLER_GO_ON;
-        in = fl->prev->cq;
-        out = fl->cq;
+        if (!hctx->fl || !hctx->fl->prev) return HANDLER_GO_ON;
+        in = hctx->fl->prev->cq;
+        out = hctx->fl->cq;
 
         /* no more data to encode. */

trunk/src/mod_proxy_core.c

@@ -574 +574 @@
                                 return PARSE_ERROR;
                         }
+                        con->response.content_length = sess->content_length;
+                        /* don't save this header, other modules might change the content length. */
+                        continue;
                 } else if (0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN("X-Sendfile")) ||
                            0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN("X-LIGHTTPD-Sendfile"))) {

trunk/src/plugin.c

@@ -124 +124 @@
 PLUGIN_STATIC(mod_evhost);
 PLUGIN_STATIC(mod_expire);
+PLUGIN_STATIC(mod_deflate);
 PLUGIN_STATIC(mod_chunked);
 PLUGIN_STATIC(mod_indexfile);
@@ -160 +161 @@
 PLUGIN_STATIC(mod_evhost),
 PLUGIN_STATIC(mod_expire),
+PLUGIN_STATIC(mod_deflate),
 PLUGIN_STATIC(mod_chunked),
 PLUGIN_STATIC(mod_indexfile),

trunk/src/response.c

@@ -32 +32 @@
         int have_date = 0;
         int have_server = 0;
+        int allow_keep_alive = 0;
 
         b = chunkqueue_get_prepend_buffer(raw);
@@ -44 +45 @@
         buffer_append_string(b, get_http_status_name(con->http_status));
 
+        if (con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) {
+                BUFFER_APPEND_STRING_CONST(b, "\r\nTransfer-Encoding: chunked");
+                allow_keep_alive = 1;
+        } else if (con->response.content_length >= 0) {
+                BUFFER_APPEND_STRING_CONST(b, "\r\nContent-Length: ");
+                buffer_append_off_t(b, con->response.content_length);
+                allow_keep_alive = 1;
+        }
+
+        /* keep-alive needs Content-Length or chunked encoding. */
+        if (!allow_keep_alive) con->keep_alive = 0;
+
         if (con->request.http_version != HTTP_VERSION_1_1 || con->keep_alive == 0) {
                 BUFFER_APPEND_STRING_CONST(b, "\r\nConnection: ");
                 buffer_append_string(b, con->keep_alive ? "keep-alive" : "close");
-        }
-
-        if (con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) {
-                BUFFER_APPEND_STRING_CONST(b, "\r\nTransfer-Encoding: chunked");
         }