Changeset 1896

Timestamp:

08/12/2007 10:02:07 PM (9 months ago)

Author:

jan

Message:

- added parsing of X-Progress-ID=... from the query-string
- fixed memory-leak
- cleaned up the connection-map

Files:

• trunk/NEWS (modified) (1 diff)
• trunk/src/mod_uploadprogress.c (modified) (23 diffs)

trunk/NEWS

@@ -5 +5 @@
-
-- 1.5.0 - ...
-m
+n
-  * replaced mod_fastcgi, mod_scgi, mod_proxy with mod_proxy_core + backends
-enabled mod_uploadprogress again
+added query-string parsing for mod_uploadprogress
-  * added threaded stat() 
-  * added threaded disk-read() support

trunk/src/mod_uploadprogress.c

@@ -19 +19 @@
- * uploadprogress for lighttpd
- *
- * no author and contact infos yet? Shamelessly adding...
- *
- * Initial: Jan Kneschke <jan@kneschke.de>
- * Timeout+Status addon: Bjoern Kalkbrenner <terminar@cyberphoria.org> [20070112]
- *
+ * the timeout is used to keep in the status information intact even if the parent 
+ * connection is gone already
- */
-
-typedef struct {
-con
+tracking
-        connection *con;
-
+
+
-        int status;
-} connection_map_entry;
@@ -53 +54 @@
-        connection_map *con_map;
-
+        buffer *tmp_buf; /** used as temporary buffer for extracting the tracking id */
+
-        plugin_config **config_storage;
-
@@ -65 +68 @@
-
-/* init the plugin data */
-
+static 
-        connection_map *cm;
-
@@ -73 +76 @@
-}
-
-
+static 
-        size_t i;
-        for (i = 0; i < cm->size; i++) {
@@ -80 +83 @@
-                if (!cme) break;
-
-con
-con
+tracking
+tracking
-                }
-                free(cme);
@@ -89 +92 @@
-}
-
-connection_map_entry *connection_map_insert(connection_map *cm, connection *con, buffer *con_id
+static connection_map_entry *connection_map_insert(connection_map *cm, buffer *tracking_id, connection *con
-        connection_map_entry *cme;
-        size_t i;
@@ -112 +115 @@
-        } else {
-                cme = malloc(sizeof(*cme));
+                cme->tracking_id = buffer_init();
-        }
-        cme->timeout = 0;
-        cme->status = 0;
-
-
+
-        cme->con = con;
-
@@ -124 +127 @@
-}
-
-connection_map_entry *connection_map_get_connection_entry(connection_map *cm, buffer *con
+static connection_map_entry *connection_map_get_connection_entry(connection_map *cm, buffer *tracking
-        size_t i;
-
@@ -130 +133 @@
-                connection_map_entry *cme = cm->ptr[i];
-
-con_id, con
+tracking_id, tracking
-                        /* found connection */
-                        return cme;
@@ -138 +141 @@
-}
-
-
+static 
-        size_t i;
-
@@ -146 +149 @@
-                if (cme == entry) {
-                        /* found connection */
-con
+tracking
-                        cme->timeout=0;
-                        cme->status=0;
-                        cme->con = NULL;
-
-                        cm->used--;
@@ -166 +168 @@
-}
-
-
+
+
+
+
+
+
+
+
+
-        size_t i;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        for (i = 0; i < cm->used; i++) {
@@ -197 +185 @@
-                if (cme->timeout != 0 && cme->timeout < now_t) {
-                        /* found connection */
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        data_string *ds;
-        buffer *b = NULL;
@@ -210 +204 @@
-        /* the request has to contain a 32byte ID */
-        if (NULL == (ds = (data_string *)array_get_element(con->request.headers, CONST_STR_LEN("X-Progress-ID")))) {
+                char *amp = NULL;
+
-                /* perhaps the POST request is using the querystring to pass the X-Progress-ID */
-                if (buffer_is_empty(con->uri.query)) {
@@ -218 +214 @@
-                                /** extract query string from request.uri */
-                                buffer_copy_string(con->uri.query, qstr + 1);
-                                b = con->uri.query;
-                        } else {
-                                return NULL;
-                        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
+                /* request header was found, use it */
-                b = ds->value;
-        }
@@ -255 +285 @@
-
-        p->con_map = connection_map_init();
+        p->tmp_buf = buffer_init();
-
-        return p;
@@ -262 +293 @@
-FREE_FUNC(mod_uploadprogress_free) {
-        plugin_data *p = p_d;
-
-        UNUSED(srv);
-
-        if (!p) return HANDLER_GO_ON;
@@ -281 +310 @@
-
-        connection_map_free(p->con_map);
+        buffer_free(p->tmp_buf);
-
-        free(p);
@@ -308 +338 @@
-
-                s = calloc(1, sizeof(plugin_config));
-_string("/progress"
+(
-                s->remove_timeout  = 60;
-                s->debug  = 0;
@@ -384 +414 @@
-        connection_map_entry *map_con_entry = NULL;
-
-
-
-
+
-
-        mod_uploadprogress_patch_connection(srv, con, p);
+
+        /* no progress URL set, ignore request */       
+        if (buffer_is_empty(p->conf.progress_url)) return HANDLER_GO_ON;
-
-        switch(con->request.http_method) {
-        case HTTP_METHOD_POST:
-
+
+
+
+
+
-                if (NULL == (tracking_id = get_tracking_id(p, con))) {
-                        return HANDLER_GO_ON;
-                }
-
-
-
+
+
+
+
-                } else {
-                        map_con_entry->timeout = 0;
-                        map_con_entry->status = 0;
-map_con_entry->con = con;
-buffer_copy_string_buffer(map_con_entry->con_id,tracking_id
+
+if (p->conf.debug) TRACE("POST: connection is known, id: %s", BUF_STR(tracking_id)
-                }
-
-                return HANDLER_GO_ON;
-        case HTTP_METHOD_GET:
+                /**
+                 * the status request for the current connection
+                 */
+                if (p->conf.debug) TRACE("(uploadprogress) urls %s == %s", BUF_STR(con->uri.path), BUF_STR(p->conf.progress_url));
+
-                if (!buffer_is_equal(con->uri.path, p->conf.progress_url)) {
-                        return HANDLER_GO_ON;
@@ -437 +479 @@
-                /* get the connection */
-                if (NULL == (post_con_entry = connection_map_get_connection_entry(p->con_map, tracking_id))) {
+                        /**
+                         * looks like we don't know the tracking id yet, GET and POST out of sync ? */
-                        BUFFER_APPEND_STRING_CONST(b, "new Object({ 'state' : 'starting' })\r\n");
-                        
+                        if (p->conf.debug) TRACE("connection unknown: %s, sending: %s", BUF_STR(tracking_id), BUF_STR(b));
+
-                        return HANDLER_FINISHED;
-
-
-
-
-
+
+
-                BUFFER_COPY_STRING_CONST(b, "new Object({ 'state' : ");
-       
+
-                if (post_con_entry->status == 413) {
+                        /* the upload was too large */  
-                        BUFFER_APPEND_STRING_CONST(b, "'error', 'status' : 413");
-
+
+
-                        buffer_append_string(b, "'done'");
-                } else {
+                        /* the upload is already done, but the connection might be still open */
-                        buffer_append_string(b, post_con_entry->con->recv->is_closed ? "'done'" : "'uploading'");
+                        BUFFER_APPEND_STRING_CONST(b, ", 'received' : ");
+                        buffer_append_off_t(b, post_con_entry->con->recv->bytes_in);
-                        BUFFER_APPEND_STRING_CONST(b, ", 'size' : ");
-                        buffer_append_off_t(b, post_con_entry->con->request.content_length == -1 ? 0 : post_con_entry->con->request.content_length);
-                        BUFFER_APPEND_STRING_CONST(b, ", 'received' : ");
-                        buffer_append_off_t(b, post_con_entry->con->recv->bytes_in);
-                }
-                BUFFER_APPEND_STRING_CONST(b, "})\r\n");
+
+                if (p->conf.debug) TRACE("connection is known: %s, sending: %s", BUF_STR(tracking_id), BUF_STR(b));
-
-                return HANDLER_FINISHED;
@@ -468 +516 @@
-}
-
+/**
+ * check if request parser sent 413 for our POST request
+ */
+URIHANDLER_FUNC(mod_uploadprogress_response_header) {
+        plugin_data *p = p_d;
+
+        buffer *tracking_id;
+        connection_map_entry *map_con_entry = NULL;
+
+        UNUSED(srv);
+
+        /*
+         * we only want to process an 413 (Bad length) error for the upload (POST request)
+         */
+        if (con->request.http_method != HTTP_METHOD_POST || con->http_status != 413) {
+                return HANDLER_GO_ON;
+        }
+
+        if (p->conf.debug) {
+                TRACE("response_header: con=%p, http_method=%d, http_status=%d",con,
+                        con->request.http_method, con->http_status);
+        }
+
+        /* get the tracker id */
+        if (NULL == (tracking_id = get_tracking_id(p, con))) {
+                return HANDLER_GO_ON;
+        }
+
+        if (NULL == (map_con_entry = connection_map_get_connection_entry(p->con_map, tracking_id))) {
+                /**
+                 * in case the request parser meant the request was too large the URI handler won't 
+                 * get called. Insert the connection mapping here
+                 */
+                if (NULL == (map_con_entry = connection_map_insert(p->con_map, tracking_id, con))) {
+                        return HANDLER_GO_ON;
+                }
+        }
+
+        /* ok, found our entries, setting 413 here for status */
+        map_con_entry->status = 413;
+        
+        return HANDLER_GO_ON;
+}
+
+/**
+ * remove the parent connection from the connection mapping
+ * when it got closed
+ *
+ * keep the mapping active for a while to send a valid final status
+ */
-REQUESTDONE_FUNC(mod_uploadprogress_request_done) {
-        plugin_data *p = p_d;
+        buffer *tracking_id;
+        connection_map_entry *cm = NULL;
-
-        UNUSED(srv);
-
-con->uri.path->used == 0
+buffer_is_empty(con->uri.path)
-        
-        /*
@@ -482 +582 @@
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
-        /*
-         * set timeout on the upload's connection_map_entry.
-         */
-
-
-
+
+
+
+
+
+
+
+
+
-
-        return HANDLER_GO_ON;
-}
-
-
-
+
+
+
+
-        plugin_data *p = p_d;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        return HANDLER_GO_ON;
-}
-
-TRIGGER_FUNC(mod_uploadprogress_trigger)
-{
-        plugin_data *p = p_d;
-
-        UNUSED(srv);
-
-        if ((srv->cur_ts % 60) != 0) return HANDLER_GO_ON;
-
-        connection_map_clear_timeout_connections(p->con_map);
-
-        return HANDLER_GO_ON;
-}
-
-/* this function is called at dlopen() time and inits the callbacks */