aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--Makefile6
-rw-r--r--src/buffer_event.c2
-rw-r--r--src/event_buffer.c3
-rw-r--r--src/luaevent.c4
5 files changed, 11 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 79e9845..78f5cfd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,9 @@
* Removes low-level read access to watermark & timeout values that break API
* Switches to watermark write accessor function to avoid API break
======
+luaevent-prosody 0.1.1 - 2010-02-25
+ * Fix overflow with high event timeouts
+======
luaevent-prosody 0.1.0 - 2010-02-15
* Fixed stack slot leak in event callbacks
* Fixed stack slot leak when error occurs in callback
diff --git a/Makefile b/Makefile
index 56241a3..9620648 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,10 @@ all:
$(CC) $(LDFLAGS) -o $(LIB) *.o -L$(LUA_LIB_DIR) -l$(LUA_LIB) -levent
install: all
- $(INSTALL_DATA) -D lua/luaevent.lua $(DESTDIR)$(INSTALL_DIR_LUA)/luaevent.lua
- $(INSTALL_PROGRAM) -D $(LIB) $(DESTDIR)$(INSTALL_DIR_BIN)/luaevent/$(LIB)
+ mkdir -p $(DESTDIR)$(INSTALL_DIR_LUA)
+ $(INSTALL_DATA) lua/luaevent.lua $(DESTDIR)$(INSTALL_DIR_LUA)/luaevent.lua
+ mkdir -p $(DESTDIR)$(INSTALL_DIR_BIN)/luaevent/
+ $(INSTALL_PROGRAM) $(LIB) $(DESTDIR)$(INSTALL_DIR_BIN)/luaevent/$(LIB)
clean:
rm -f *.so
diff --git a/src/buffer_event.c b/src/buffer_event.c
index 8a663bc..598230f 100644
--- a/src/buffer_event.c
+++ b/src/buffer_event.c
@@ -1,9 +1,9 @@
/* LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
* Licensed as LGPL - See doc/COPYING for details */
+#include <stdlib.h>
#include "buffer_event.h"
#include "utility.h"
#include <lauxlib.h>
-#include <malloc.h>
#include "event_buffer.h"
#define BUFFER_EVENT_MT "BUFFER_EVENT_MT"
diff --git a/src/event_buffer.c b/src/event_buffer.c
index ea66a94..a61c643 100644
--- a/src/event_buffer.c
+++ b/src/event_buffer.c
@@ -1,9 +1,8 @@
/* LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
* Licensed as LGPL - See doc/COPYING for details */
-
+#include <stdlib.h>
#include "event_buffer.h"
#include <lauxlib.h>
-#include <malloc.h>
#define EVENT_BUFFER_MT "EVENT_BUFFER_MT"
diff --git a/src/luaevent.c b/src/luaevent.c
index 6036cf1..89c295a 100644
--- a/src/luaevent.c
+++ b/src/luaevent.c
@@ -56,8 +56,8 @@ int getSocketFd(lua_State* L, int idx) {
}
void load_timeval(double time, struct timeval *tv) {
- tv->tv_sec = (int)time;
- tv->tv_usec = (int)(time * 1000000) % 1000000;
+ tv->tv_sec = (int) time;
+ tv->tv_usec = (int)( (time - tv->tv_sec) * 1000000 );
}
/* sock, event, callback, timeout */