Browse Source

Use connection_reset instead of handle_request_done for cleanup callbacks

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2588 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.24
Stefan Bühler 13 years ago
parent
commit
5e91465797
  1. 1
      NEWS
  2. 16
      src/mod_mysql_vhost.c
  3. 4
      src/mod_setenv.c

1
NEWS

@ -21,6 +21,7 @@ NEWS
* Show "no uri specified -> 400" error only when "debug.log-request-header-on-error" is enabled (fixes #2030)
* Fix hanging connection in mod_scgi (fixes #2024)
* Allow digits in hostnames in more places (fixes #1148)
* Use connection_reset instead of handle_request_done for cleanup callbacks
- 1.4.23 - 2009-06-19
* Added some extra warning options in cmake and fix the resulting warnings (unused/static functions)

16
src/mod_mysql_vhost.c

@ -424,15 +424,15 @@ ERR500: if (result) mysql_free_result(result);
/* this function is called at dlopen() time and inits the callbacks */
int mod_mysql_vhost_plugin_init(plugin *p);
int mod_mysql_vhost_plugin_init(plugin *p) {
p->version = LIGHTTPD_VERSION_ID;
p->name = buffer_init_string("mysql_vhost");
p->version = LIGHTTPD_VERSION_ID;
p->name = buffer_init_string("mysql_vhost");
p->init = mod_mysql_vhost_init;
p->cleanup = mod_mysql_vhost_cleanup;
p->handle_request_done = mod_mysql_vhost_handle_connection_close;
p->init = mod_mysql_vhost_init;
p->cleanup = mod_mysql_vhost_cleanup;
p->connection_reset = mod_mysql_vhost_handle_connection_close;
p->set_defaults = mod_mysql_vhost_set_defaults;
p->handle_docroot = mod_mysql_vhost_handle_docroot;
p->set_defaults = mod_mysql_vhost_set_defaults;
p->handle_docroot = mod_mysql_vhost_handle_docroot;
return 0;
}
@ -441,7 +441,7 @@ int mod_mysql_vhost_plugin_init(plugin *p) {
int mod_mysql_vhost_plugin_init(plugin *p);
int mod_mysql_vhost_plugin_init(plugin *p) {
p->version = LIGHTTPD_VERSION_ID;
p->name = buffer_init_string("mysql_vhost");
p->name = buffer_init_string("mysql_vhost");
return 0;
}

4
src/mod_setenv.c

@ -215,7 +215,7 @@ URIHANDLER_FUNC(mod_setenv_uri_handler) {
return HANDLER_GO_ON;
}
REQUESTDONE_FUNC(mod_setenv_reset) {
CONNECTION_FUNC(mod_setenv_reset) {
plugin_data *p = p_d;
UNUSED(srv);
@ -240,7 +240,7 @@ int mod_setenv_plugin_init(plugin *p) {
p->set_defaults = mod_setenv_set_defaults;
p->cleanup = mod_setenv_free;
p->handle_request_done = mod_setenv_reset;
p->connection_reset = mod_setenv_reset;
p->data = NULL;

Loading…
Cancel
Save