Browse Source

Fix mod_magnet to set con->mode = p->id if it generates content, so returning 4xx/5xx doesn't append an error page

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2155 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.20
Stefan Bühler 14 years ago
parent
commit
73189c64e7
  1. 1
      NEWS
  2. 4
      src/mod_magnet.c

1
NEWS

@ -20,6 +20,7 @@ NEWS
* Overwrite Content-Type header in mod_dirlisting instead of inserting (#1614), patch by Henrik Holst
* Handle EINTR in mod_cgi during write() (#1640)
* Allow all http status codes by default; disable body only for 204,205 and 304; generate error pages for 4xx and 5xx (#1639)
* Fix mod_magnet to set con->mode = p->id if it generates content, so returning 4xx/5xx doesn't append an error page
- 1.4.19 - 2008-03-10

4
src/mod_magnet.c

@ -767,11 +767,13 @@ static handler_t magnet_attract(server *srv, connection *con, plugin_data *p, bu
if (lua_return_value > 99) {
con->http_status = lua_return_value;
con->file_finished = 1;
/* try { ...*/
if (0 == setjmp(exceptionjmp)) {
magnet_attach_content(srv, con, p, L);
if (!chunkqueue_is_empty(con->write_queue)) {
con->mode = p->id;
}
} else {
/* } catch () { */
con->http_status = 500;

Loading…
Cancel
Save