Ticket #536: lighttpd.ssi.patch

mod_ssi.c

@@ -286 +286 @@
         return 0;
 }
 
+URIHANDLER_FUNC(mod_ssi_physical_path);
+
 static int process_ssi_stmt(server *srv, connection *con, plugin_data *p, 
                             const char **l, size_t n) {
         size_t i, ssicmd = 0;
@@ -546 +548 @@
                 }
                 
                 if (0 == stat(p->stat_fn->ptr, &st)) {
+                        buffer *tmp;
                         time_t t = st.st_mtime;
                         
                         switch (ssicmd) {
@@ -574 +577 @@
                                 }
                                 break;
                         case SSI_INCLUDE:
-                                chunkqueue_append_file(con->write_queue, p->stat_fn, 0, st.st_size);
-                                break;
+                                /* do recursive SSI expansion */
+                                
+                                /* prevents infinite loop */
+                                if (con->loops_per_request > 25 || buffer_is_equal(con->physical.path, p->stat_fn)) {
+                                        buffer_copy_string(srv->tmp_buf, "<!-- your include directives create an infinite loop; aborting -->");
+                                        chunkqueue_append_buffer(con->write_queue, srv->tmp_buf);
+                                        break;
+                                }
+
+                                tmp = buffer_init();
+                                buffer_copy_string_buffer(tmp, con->physical.path); /* save path of current document */
+                                buffer_copy_string_buffer(con->physical.path, p->stat_fn); /* next sub-document to parse */
+                                if (mod_ssi_physical_path(srv,con,p) != HANDLER_FINISHED) {
+                                        /* the document was not processed, so write it as is */
+                                        chunkqueue_append_file(con->write_queue, con->physical.path, 0, st.st_size);
+                                }
+                                buffer_copy_string_buffer(con->physical.path, tmp); /* restore saved path */
+                                buffer_free(tmp);
+                        break;
                         }
                 } else {
                         log_error_write(srv, __FILE__, __LINE__, "sbs",
@@ -1044 +1064 @@
         
         if (con->physical.path->used == 0) return HANDLER_GO_ON;
         
+        con->loops_per_request++;
+        
         mod_ssi_patch_connection(srv, con, p);
         
         for (k = 0; k < p->conf.ssi_extension->used; k++) {