Browse Source

Move fdevent subsystem includes to implementation files to reduce conflicts (fixes #2373)

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2823 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.31
Stefan Bühler 10 years ago
parent
commit
79bcfab083
  1. 1
      NEWS
  2. 9
      src/fdevent.h
  3. 4
      src/fdevent_freebsd_kqueue.c
  4. 3
      src/fdevent_libev.c
  5. 3
      src/fdevent_linux_sysepoll.c
  6. 7
      src/fdevent_poll.c
  7. 2
      src/fdevent_solaris_devpoll.c

1
NEWS

@ -5,6 +5,7 @@ NEWS
- 1.4.31 -
* [ssl] fix segfault in counting renegotiations for openssl versions without TLSEXT/SNI
* Move fdevent subsystem includes to implementation files to reduce conflicts (fixes #2373)
- 1.4.30 - 2011-12-18
* Always use our 'own' md5 implementation, fixes linking issues on MacOS (fixes #2331)

9
src/fdevent.h

@ -20,18 +20,12 @@
#if defined(HAVE_EPOLL_CTL) && defined(HAVE_SYS_EPOLL_H)
# define USE_LINUX_EPOLL
# include <sys/epoll.h>
#endif
/* MacOS 10.3.x has poll.h under /usr/include/, all other unixes
* under /usr/include/sys/ */
#if defined HAVE_POLL && (defined(HAVE_SYS_POLL_H) || defined(HAVE_POLL_H))
# define USE_POLL
# ifdef HAVE_POLL_H
# include <poll.h>
# else
# include <sys/poll.h>
# endif
#endif
#if defined HAVE_SELECT
@ -46,7 +40,6 @@
#if defined HAVE_SYS_DEVPOLL_H && defined(__sun)
# define USE_SOLARIS_DEVPOLL
# include <sys/devpoll.h>
#endif
#if defined HAVE_PORT_H && defined HAVE_PORT_CREATE && defined(__sun)
@ -56,12 +49,10 @@
#if defined HAVE_SYS_EVENT_H && defined HAVE_KQUEUE
# define USE_FREEBSD_KQUEUE
# include <sys/event.h>
#endif
#if defined HAVE_LIBEV
# define USE_LIBEV
# include <ev.h>
#endif
struct server;

4
src/fdevent_freebsd_kqueue.c

@ -13,8 +13,8 @@
#include <fcntl.h>
#ifdef USE_FREEBSD_KQUEUE
#include <sys/event.h>
#include <sys/time.h>
# include <sys/event.h>
# include <sys/time.h>
static void fdevent_freebsd_kqueue_free(fdevents *ev) {
close(ev->kq_fd);

3
src/fdevent_libev.c

@ -5,6 +5,9 @@
#include <assert.h>
#ifdef USE_LIBEV
# include <ev.h>
static void io_watcher_cb(struct ev_loop *loop, ev_io *w, int revents) {
fdevents *ev = w->data;
fdnode *fdn = ev->fdarray[w->fd];

3
src/fdevent_linux_sysepoll.c

@ -13,6 +13,9 @@
#include <fcntl.h>
#ifdef USE_LINUX_EPOLL
# include <sys/epoll.h>
static void fdevent_linux_sysepoll_free(fdevents *ev) {
close(ev->epoll_fd);
free(ev->epoll_events);

7
src/fdevent_poll.c

@ -13,6 +13,13 @@
#include <fcntl.h>
#ifdef USE_POLL
# ifdef HAVE_POLL_H
# include <poll.h>
# else
# include <sys/poll.h>
# endif
static void fdevent_poll_free(fdevents *ev) {
free(ev->pollfds);
if (ev->unused.ptr) free(ev->unused.ptr);

2
src/fdevent_solaris_devpoll.c

@ -14,6 +14,8 @@
#ifdef USE_SOLARIS_DEVPOLL
# include <sys/devpoll.h>
static void fdevent_solaris_devpoll_free(fdevents *ev) {
free(ev->devpollfds);
close(ev->devpoll_fd);

Loading…
Cancel
Save