Changeset 1899

Timestamp:

08/13/2007 11:15:22 AM (13 months ago)

Author:

darix

Message:

- fix the frigging 404-handler bugs:

• dont restore the http status code unconditionally (1270)
• mod_staticfile should set the http status properly. otherwise we run into the 404 handling twice and it appends the default 404 page to the content. (this passed the testsuite)

Location:

branches/lighttpd-1.4.x/src

Files:

• connections.c (modified) (1 diff)
• mod_staticfile.c (modified) (1 diff)

branches/lighttpd-1.4.x/src/connections.c

@@ -1446 +1446 @@
                                         /* error-handler is back and has generated content */
                                         /* if Status: was set, take it otherwise use 200 */
-                                        con->http_status = con->error_handler_saved_status;
+                                        if (con->http_status == 0) {
+                                                con->http_status = con->error_handler_saved_status;
+                                        }
                                 }
 

branches/lighttpd-1.4.x/src/mod_staticfile.c

@@ -507 +507 @@
         http_chunk_append_file(srv, con, con->physical.path, 0, sce->st.st_size);
 
+        con->http_status = 200;
         con->file_finished = 1;