Compare commits

...

6 Commits

Author SHA1 Message Date
Stefan Bühler 54d7b46774 [lua] protect setup and action metatable 2 months ago
Stefan Bühler 3bf903c398 [lua] provide and use li_lua_new_protected_metatable to prevent tampering with metatables 2 months ago
Stefan Bühler 53337c81d4 [lua] prevent tampering with global "lighty" table 2 months ago
Stefan Bühler 5977493f47 [lua] one li_lua_init_*_mt function per "file", add a few missing ones 2 months ago
Stefan Bühler 7aec09dd27 [lua] split all metatable init/create code into separate functions 2 months ago
Stefan Bühler 4a4fd8fd11 [core] include and use hedley (v15) header 2 months ago
  1. 2
      COPYING
  2. 2
      include/lighttpd/actions_lua.h
  3. 4
      include/lighttpd/angel_log.h
  4. 2
      include/lighttpd/condition_lua.h
  5. 3
      include/lighttpd/config_lua.h
  6. 51
      include/lighttpd/core_lua.h
  7. 2
      include/lighttpd/events.h
  8. 2042
      include/lighttpd/hedley.h
  9. 4
      include/lighttpd/log.h
  10. 50
      include/lighttpd/settings.h
  11. 2
      include/lighttpd/sys_socket.h
  12. 4
      include/lighttpd/utils.h
  13. 2
      include/lighttpd/value_lua.h
  14. 2
      src/angel/angel_config_parser.rl
  15. 36
      src/common/mempool.c
  16. 6
      src/common/waitqueue.c
  17. 52
      src/main/actions_lua.c
  18. 1
      src/main/base_lua.c
  19. 38
      src/main/chunk_lua.c
  20. 88
      src/main/condition_lua.c
  21. 28
      src/main/config_lua.c
  22. 2
      src/main/config_parser.rl
  23. 43
      src/main/core_lua.c
  24. 18
      src/main/environment_lua.c
  25. 18
      src/main/filters_lua.c
  26. 4
      src/main/http_headers.c
  27. 18
      src/main/http_headers_lua.c
  28. 4
      src/main/log.c
  29. 2
      src/main/network.c
  30. 8
      src/main/pattern.c
  31. 18
      src/main/physical_lua.c
  32. 37
      src/main/request_lua.c
  33. 18
      src/main/response_lua.c
  34. 19
      src/main/stat_lua.c
  35. 18
      src/main/subrequest_lua.c
  36. 6
      src/main/throttle.c
  37. 18
      src/main/value_lua.c
  38. 33
      src/main/virtualrequest_lua.c
  39. 2
      src/modules/fastcgi_stream.c
  40. 4
      src/modules/gnutls_filter.c
  41. 15
      src/modules/mod_lua.c
  42. 38
      src/modules/mod_memcached.c
  43. 2
      src/modules/mod_openssl.c
  44. 4
      src/modules/openssl_filter.c

2
COPYING

@ -32,3 +32,5 @@ From doc/bootstrap* (Apache License 2.0):
Licensed under http://www.apache.org/licenses/LICENSE-2.0
From doc/jquery-1.10.1.min.js (MIT License):
(c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
Also include/lighttpd/hedley.h is licensed as CC0-1.0 by Evan Nemerson.

2
include/lighttpd/actions_lua.h

@ -4,6 +4,8 @@
#include <lighttpd/base.h>
#include <lua.h>
LI_API void li_lua_init_action_mt(liServer *srv, lua_State *L);
LI_API liAction* li_lua_get_action(lua_State *L, int ndx);
LI_API int li_lua_push_action(liServer *srv, lua_State *L, liAction *a);

4
include/lighttpd/angel_log.h

@ -72,10 +72,10 @@ struct liLog {
LI_API void li_log_init(liServer *srv);
LI_API void li_log_clean(liServer *srv);
LI_API void li_log_write(liServer *srv, liLogLevel log_level, guint flags, const gchar *fmt, ...) G_GNUC_PRINTF(4, 5);
LI_API void li_log_write(liServer *srv, liLogLevel log_level, guint flags, const gchar *fmt, ...) HEDLEY_PRINTF_FORMAT(4, 5);
/* replaces '\r' and '\n' with '\0' */
LI_API void li_log_split_lines(liServer *srv, liLogLevel log_level, guint flags, gchar *txt, const gchar *prefix);
LI_API void li_log_split_lines_(liServer *srv, liLogLevel log_level, guint flags, gchar *txt, const gchar *fmt, ...) G_GNUC_PRINTF(5, 6);
LI_API void li_log_split_lines_(liServer *srv, liLogLevel log_level, guint flags, gchar *txt, const gchar *fmt, ...) HEDLEY_PRINTF_FORMAT(5, 6);
#endif

2
include/lighttpd/condition_lua.h

@ -4,6 +4,8 @@
#include <lighttpd/base.h>
#include <lua.h>
LI_API void li_lua_init_condition_mt(liServer *srv, lua_State *L);
LI_API liCondition* li_lua_get_condition(lua_State *L, int ndx);
LI_API int li_lua_push_condition(liServer *srv, lua_State *L, liCondition *c);

3
include/lighttpd/config_lua.h

@ -2,8 +2,7 @@
#define _LIGHTTPD_CONFIG_LUA_H_
#include <lighttpd/base.h>
#include <lualib.h>
#include <lua.h>
LI_API gboolean li_config_lua_load(liLuaState *LL, liServer *srv, liWorker *wrk, const gchar *filename, liAction **pact, gboolean allow_setup, liValue *args);

51
include/lighttpd/core_lua.h

@ -3,6 +3,7 @@
#include <lighttpd/base.h>
#include <lua.h>
#include <lauxlib.h>
#define LI_LUA_REGISTRY_STATE "lighttpd.state"
#define LI_LUA_REGISTRY_SERVER "lighttpd.server"
@ -14,65 +15,85 @@ LI_API liLuaState *li_lua_state_get(lua_State *L);
INLINE void li_lua_lock(liLuaState *LL);
INLINE void li_lua_unlock(liLuaState *LL);
/* expect (meta)table at top of the stack */
INLINE void li_lua_protect_metatable(lua_State *L);
INLINE int li_lua_new_protected_metatable(lua_State *L, const char *tname);
/* chunk_lua.c */
LI_API void li_lua_init_chunk_mt(lua_State *L);
LI_API liChunk* li_lua_get_chunk(lua_State *L, int ndx);
LI_API int li_lua_push_chunk(lua_State *L, liChunk *c);
LI_API liChunkQueue* li_lua_get_chunkqueue(lua_State *L, int ndx);
LI_API int li_lua_push_chunkqueue(lua_State *L, liChunkQueue *cq);
LI_API void li_lua_init_connection_mt(lua_State *L);
LI_API liConnection* li_lua_get_connection(lua_State *L, int ndx);
LI_API int li_lua_push_connection(lua_State *L, liConnection *con);
/* environment_lua.c */
LI_API void li_lua_init_environment_mt(lua_State *L);
LI_API liEnvironment* li_lua_get_environment(lua_State *L, int ndx);
LI_API int li_lua_push_environment(lua_State *L, liEnvironment *env);
/* filters_lua.c */
LI_API void li_lua_init_filter_mt(lua_State *L);
/* create entries in `lighty.` table, which must be on top of the stack */
LI_API void li_lua_init_filters(lua_State *L, liServer* srv);
LI_API liFilter* li_lua_get_filter(lua_State *L, int ndx);
LI_API int li_lua_push_filter(lua_State *L, liFilter *f);
LI_API void li_lua_init_filters(lua_State *L, liServer* srv);
LI_API liFilter* li_lua_vrequest_add_filter_in(lua_State *L, liVRequest *vr, int state_ndx);
LI_API liFilter* li_lua_vrequest_add_filter_out(lua_State *L, liVRequest *vr, int state_ndx);
/* http_headers_lua.c */
LI_API void li_lua_init_http_headers_mt(lua_State *L);
LI_API liHttpHeaders* li_lua_get_http_headers(lua_State *L, int ndx);
LI_API int li_lua_push_http_headers(lua_State *L, liHttpHeaders *headers);
/* physical_lua.c */
LI_API void li_lua_init_physical_mt(lua_State *L);
LI_API liPhysical* li_lua_get_physical(lua_State *L, int ndx);
LI_API int li_lua_push_physical(lua_State *L, liPhysical *phys);
/* request_lua.c */
LI_API void li_lua_init_request_mt(lua_State *L);
LI_API liRequest* li_lua_get_request(lua_State *L, int ndx);
LI_API int li_lua_push_request(lua_State *L, liRequest *req);
LI_API liRequestUri* li_lua_get_requesturi(lua_State *L, int ndx);
LI_API int li_lua_push_requesturi(lua_State *L, liRequestUri *uri);
/* response_lua.c */
LI_API void li_lua_init_response_mt(lua_State *L);
LI_API liResponse* li_lua_get_response(lua_State *L, int ndx);
LI_API int li_lua_push_response(lua_State *L, liResponse *resp);
/* stat_lua.c */
LI_API void li_lua_init_stat_mt(lua_State *L);
LI_API struct stat* li_lua_get_stat(lua_State *L, int ndx);
LI_API int li_lua_push_stat(lua_State *L, struct stat *st);
/* subrequest_lua.c */
LI_API void li_lua_init_subrequest_mt(lua_State *L);
LI_API void li_lua_init_vrequest_mt(lua_State *L);
/* virtualrequest_lua.c */
LI_API void li_lua_init_virtualrequest_mt(lua_State *L);
LI_API liVRequest* li_lua_get_vrequest(lua_State *L, int ndx);
LI_API int li_lua_push_vrequest(lua_State *L, liVRequest *vr);
LI_API void li_lua_init_coninfo_mt(lua_State *L);
LI_API liConInfo* li_lua_get_coninfo(lua_State *L, int ndx);
LI_API int li_lua_push_coninfo(lua_State *L, liConInfo *vr);
/* everything else: core_lua.c */
LI_API int li_lua_fixindex(lua_State *L, int ndx);
/* return 1 if value is found in mt (on top of the stack), 0 if it is not found (stack balance = 0)
* table, key on stack at pos 0 and 1 (i.e. __index metho)
* table, key on stack at pos 0 and 1 (i.e. __index method)
*/
LI_API int li_lua_metatable_index(lua_State *L);
@ -121,4 +142,18 @@ INLINE void li_lua_unlock(liLuaState *LL) {
g_static_rec_mutex_unlock(&LL->lualock);
}
INLINE void li_lua_protect_metatable(lua_State *L) {
/* __metatable key prevents accessing metatable of objects/tables in normal lua code */
lua_pushboolean(L, FALSE);
lua_setfield(L, -2, "__metatable");
}
INLINE int li_lua_new_protected_metatable(lua_State *L, const char *tname) {
int r = luaL_newmetatable(L, tname);
if (r) {
li_lua_protect_metatable(L);
}
return r;
}
#endif

2
include/lighttpd/events.h

@ -8,7 +8,7 @@ enum {
LI_EV_READ = 0x01,
LI_EV_WRITE = 0x02,
LI_EV_WAKEUP = 0x04
};
} HEDLEY_FLAGS;
typedef enum {
LI_EVT_NONE = 0,

2042
include/lighttpd/hedley.h

File diff suppressed because it is too large

4
include/lighttpd/log.h

@ -156,11 +156,11 @@ LI_API void li_log_context_set(liLogContext *context, liLogMap *log_map);
LI_API gboolean li_log_write_direct(liServer *srv, liWorker *wrk, GString *path, GString *msg);
/* li_log_write is used to write to the errorlog */
LI_API gboolean li_log_write(liServer *srv, liWorker *wrk, liLogContext* context, liLogLevel log_level, guint flags, const gchar *fmt, ...) G_GNUC_PRINTF(6, 7);
LI_API gboolean li_log_write(liServer *srv, liWorker *wrk, liLogContext* context, liLogLevel log_level, guint flags, const gchar *fmt, ...) HEDLEY_PRINTF_FORMAT(6, 7);
/* replaces '\r' and '\n' with '\0' */
LI_API void li_log_split_lines(liServer *srv, liWorker *wrk, liLogContext* context, liLogLevel log_level, guint flags, gchar *txt, const gchar *prefix);
LI_API void li_log_split_lines_(liServer *srv, liWorker *wrk, liLogContext* context, liLogLevel log_level, guint flags, gchar *txt, const gchar *fmt, ...) G_GNUC_PRINTF(7, 8);
LI_API void li_log_split_lines_(liServer *srv, liWorker *wrk, liLogContext* context, liLogLevel log_level, guint flags, gchar *txt, const gchar *fmt, ...) HEDLEY_PRINTF_FORMAT(7, 8);
#endif

50
include/lighttpd/settings.h

@ -1,6 +1,8 @@
#ifndef _LIGHTTPD_SETTINGS_H_
#define _LIGHTTPD_SETTINGS_H_
#include <lighttpd/hedley.h>
/* check which OS we are compiling for */
#if defined(__BEOS__)
# define LIGHTY_OS_BEOS
@ -163,57 +165,15 @@
# define USE_WRITE
#endif
/* Shared library support */
#ifdef _WIN32
#define LI_IMPORT __declspec(dllimport)
#define LI_EXPORT __declspec(dllexport)
#define LI_DLLLOCAL
#define LI_DLLPUBLIC
#else
#define LI_IMPORT
#ifdef GCC_HASCLASSVISIBILITY
#define LI_EXPORT __attribute__ ((visibility("default")))
#define LI_DLLLOCAL __attribute__ ((visibility("hidden")))
#define LI_DLLPUBLIC __attribute__ ((visibility("default")))
#else
#define LI_EXPORT
#define LI_DLLLOCAL
#define LI_DLLPUBLIC
#endif
#endif
#ifdef LI_DECLARE_EXPORTS
#define LI_API LI_EXPORT
#else
#define LI_API LI_IMPORT
#endif
/* Throwable classes must always be visible on GCC in all binaries */
#ifdef _WIN32
#define LI_EXCEPTIONAPI(api) api
#elif defined(GCC_HASCLASSVISIBILITY)
#define LI_EXCEPTIONAPI(api) LI_EXPORT
# define LI_API HEDLEY_PUBLIC
#else
#define LI_EXCEPTIONAPI(api)
#endif
#ifdef UNUSED_PARAM
#elif defined(__GNUC__)
# define UNUSED_PARAM(x) UNUSED_ ## x __attribute__((unused))
#elif defined(__LCLINT__)
# define UNUSED_PARAM(x) /*@unused@*/ x
#else
# define UNUSED_PARAM(x) x
# define LI_API HEDLEY_IMPORT
#endif
#define UNUSED(x) ( (void)(x) )
#if __GNUC__
#define INLINE static inline
/* # define INLINE extern inline */
#else
# define INLINE static
#endif
#define INLINE static HEDLEY_INLINE
#ifdef PACKAGE_NO_BUILD_DATE
# undef PACKAGE_BUILD_DATE

2
include/lighttpd/sys_socket.h

@ -34,7 +34,7 @@
#define sockread( fd, buf, bytes ) recv( fd, buf, bytes, 0 )
LI_EXPORT const char * inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
LI_API const char * inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
int inet_aton(const char *cp, struct in_addr *inp);
#define HAVE_INET_ADDR
#undef HAVE_INET_ATON

4
include/lighttpd/utils.h

@ -10,11 +10,11 @@ typedef enum {
} liCounterType;
/* log message, print backtrace, and abort() (use LI_FATAL(msg) to call it) */
LI_API void li_fatal(const char *filename, unsigned int line, const char *function, const char *msg) G_GNUC_NORETURN;
LI_API void li_fatal(const char *filename, unsigned int line, const char *function, const char *msg) HEDLEY_NO_RETURN;
/* if libunwind is available this prints a backtrace to STDERR */
LI_API void li_print_backtrace_stderr(void);
/* LI_FORCE_ASSERT is *always* active - in debug and release builds */
#define LI_FORCE_ASSERT(x) do { if (G_UNLIKELY(!(x))) li_fatal(__FILE__, __LINE__, G_STRFUNC, "Assertion `" #x "' failed."); } while(0)
#define LI_FORCE_ASSERT(x) do { if (HEDLEY_UNLIKELY(!(x))) li_fatal(__FILE__, __LINE__, G_STRFUNC, "Assertion `" #x "' failed."); } while(0)
#define LI_FATAL(msg) li_fatal(__FILE__, __LINE__, G_STRFUNC, msg)
/* set O_NONBLOCK and FD_CLOEXEC */

2
include/lighttpd/value_lua.h

@ -4,6 +4,8 @@
#include <lighttpd/base.h>
#include <lua.h>
LI_API void li_lua_init_value_mt(lua_State *L);
/* converts the top of the stack into an value
* and pops the value
* returns NULL if it couldn't convert the value (still pops it)

2
src/angel/angel_config_parser.rl

@ -72,7 +72,7 @@ struct liConfigTokenizerContext {
GHashTable *variables;
};
static liConfigToken tokenizer_error(liConfigTokenizerContext *ctx, GError **error, const char *fmt, ...) G_GNUC_PRINTF(3, 4);
static liConfigToken tokenizer_error(liConfigTokenizerContext *ctx, GError **error, const char *fmt, ...) HEDLEY_PRINTF_FORMAT(3, 4);
GQuark li_angel_config_parser_error_quark(void) {
return g_quark_from_string("li-angel-config-parser-error-quark");

36
src/common/mempool.c

@ -158,7 +158,7 @@ static inline gsize mp_align_size(gsize size) {
}
gsize li_mempool_align_page_size(gsize size) {
if (G_UNLIKELY(!mp_initialized)) {
if (HEDLEY_UNLIKELY(!mp_initialized)) {
mempool_init();
}
return mp_align_size(size);
@ -167,17 +167,17 @@ gsize li_mempool_align_page_size(gsize size) {
static inline void* mp_alloc_page(gsize size) {
void *ptr;
# ifdef MAP_ANON
if (G_UNLIKELY(MAP_FAILED == (ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0)))) {
if (HEDLEY_UNLIKELY(MAP_FAILED == (ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0)))) {
g_error ("%s: failed to allocate %"G_GSIZE_FORMAT" bytes with mmap", G_STRLOC, size);
}
# else
if (G_UNLIKELY(NULL == (ptr = g_malloc(size)))) {
if (HEDLEY_UNLIKELY(NULL == (ptr = g_malloc(size)))) {
g_error ("%s: failed to allocate %"G_GSIZE_FORMAT" bytes", G_STRLOC, size);
}
# endif
#ifdef WITH_PROFILER
if (G_UNLIKELY(li_profiler_enabled)) {
if (HEDLEY_UNLIKELY(li_profiler_enabled)) {
li_profiler_hashtable_insert((gpointer)ptr, size);
}
#endif
@ -195,7 +195,7 @@ static inline void mp_free_page(const void *ptr, gsize size) {
# endif
#ifdef WITH_PROFILER
if (G_UNLIKELY(li_profiler_enabled)) {
if (HEDLEY_UNLIKELY(li_profiler_enabled)) {
li_profiler_hashtable_remove((gpointer)ptr);
}
#endif
@ -299,7 +299,7 @@ static inline void mp_mag_free(mp_magazine *mag, void *ptr) {
if (id == mag->next - 1) mag->next--; /* if chunk was just allocated, "undo" it */
# endif
if (G_UNLIKELY(0 == mag->used)) {
if (HEDLEY_UNLIKELY(0 == mag->used)) {
mp_free_page(mag->data, mag->count * mag->chunksize);
mag->data = NULL;
# ifndef MP_SEARCH_BITVECTOR
@ -363,16 +363,16 @@ static inline mp_pool* mp_pools_get(gsize size) {
mp_pool *pool;
pools = g_private_get(thread_pools);
if (G_UNLIKELY(!pools)) {
if (HEDLEY_UNLIKELY(!pools)) {
pools = g_slice_new0(mp_pools);
g_private_set(thread_pools, pools);
}
for (iter = pools->queue.head; iter; iter = iter->next) {
pool = iter->data;
if (G_LIKELY(pool->chunksize == size)) {
if (HEDLEY_LIKELY(pool->chunksize == size)) {
goto done;
} else if (G_UNLIKELY(pool->chunksize > size)) {
} else if (HEDLEY_UNLIKELY(pool->chunksize > size)) {
pool = mp_pool_new(size);
_queue_insert_before(&pools->queue, iter, &pool->pools_list);
goto done;
@ -392,15 +392,15 @@ liMempoolPtr li_mempool_alloc(gsize size) {
mp_magazine *mag;
guint i;
if (G_UNLIKELY(!mp_initialized)) {
if (HEDLEY_UNLIKELY(!mp_initialized)) {
mempool_init();
}
size = mp_align_size(size);
/* mp_alloc_page fallback */
if (G_UNLIKELY(size > MP_MAX_ALLOC_SIZE/MP_MIN_ALLOC_COUNT)) {
if (G_UNLIKELY(NULL == (ptr.data = mp_alloc_page(size)))) {
if (HEDLEY_UNLIKELY(size > MP_MAX_ALLOC_SIZE/MP_MIN_ALLOC_COUNT)) {
if (HEDLEY_UNLIKELY(NULL == (ptr.data = mp_alloc_page(size)))) {
g_error ("%s: failed to allocate %"G_GSIZE_FORMAT" bytes", G_STRLOC, size);
}
return ptr;
@ -411,12 +411,12 @@ liMempoolPtr li_mempool_alloc(gsize size) {
/* Try to lock a unlocked magazine if possible; creating new magazines is allowed
* (new ones can't be locked as only the current thread knows this magazine)
* Spinlock the first magazine if first strategy failed */
if (G_LIKELY(pool->magazines[0])) {
if (HEDLEY_LIKELY(pool->magazines[0])) {
/* at least one magazine available */
for (i = 0; i < MP_MAX_MAGAZINES; i++) {
mag = pool->magazines[i];
if (!mag) break;
if (G_LIKELY(MP_TRYLOCK(mag->mutex))) {
if (HEDLEY_LIKELY(MP_TRYLOCK(mag->mutex))) {
goto found_mag;
}
}
@ -436,9 +436,9 @@ found_mag:
mp_mag_acquire(mag); /* keep track of chunk count */
# ifndef MP_SEARCH_BITVECTOR
if (G_UNLIKELY(mag->next == mag->count)) {
if (HEDLEY_UNLIKELY(mag->next == mag->count)) {
# else
if (G_UNLIKELY(mag->used == mag->count)) {
if (HEDLEY_UNLIKELY(mag->used == mag->count)) {
# endif
/* full magazine; remove from pool */
guint j;
@ -468,7 +468,7 @@ void li_mempool_free(liMempoolPtr ptr, gsize size) {
size = mp_align_size(size);
/* mp_alloc_page fallback */
if (G_UNLIKELY(size > MP_MAX_ALLOC_SIZE/MP_MIN_ALLOC_COUNT)) {
if (HEDLEY_UNLIKELY(size > MP_MAX_ALLOC_SIZE/MP_MIN_ALLOC_COUNT)) {
mp_free_page(ptr.data, size);
return;
}
@ -486,7 +486,7 @@ void li_mempool_cleanup(void) {
/* "Force" thread-private cleanup */
mp_pools *pools;
if (G_UNLIKELY(!mp_initialized)) {
if (HEDLEY_UNLIKELY(!mp_initialized)) {
mempool_init();
}

6
src/common/waitqueue.c

@ -34,7 +34,7 @@ void li_waitqueue_update(liWaitQueue *queue) {
li_tstamp repeat;
li_tstamp now = li_event_now(li_event_get_loop(&queue->timer));
if (G_LIKELY(queue->head)) {
if (HEDLEY_LIKELY(queue->head)) {
repeat = queue->head->ts + queue->delay - now;
if (repeat < 0.05) repeat = 0.05;
@ -85,7 +85,7 @@ void li_waitqueue_push(liWaitQueue *queue, liWaitQueueElem *elem) {
queue->tail = elem;
}
if (G_UNLIKELY(!li_event_active(&queue->timer)))
if (HEDLEY_UNLIKELY(!li_event_active(&queue->timer)))
li_event_timer_once(&queue->timer, queue->delay);
}
@ -150,7 +150,7 @@ void li_waitqueue_remove(liWaitQueue *queue, liWaitQueueElem *elem) {
elem->queued = FALSE;
queue->length--;
if (G_UNLIKELY(!queue->head))
if (HEDLEY_UNLIKELY(!queue->head))
li_event_stop(&queue->timer);
}

52
src/main/actions_lua.c

@ -3,23 +3,8 @@
#include <lighttpd/config_lua.h>
#include <lighttpd/core_lua.h>
#include <lualib.h>
#include <lauxlib.h>
#define LUA_ACTION "liAction*"
liAction* li_lua_get_action(lua_State *L, int ndx) {
if (!lua_isuserdata(L, ndx)) return NULL;
if (!lua_getmetatable(L, ndx)) return NULL;
luaL_getmetatable(L, LUA_ACTION);
if (lua_isnil(L, -1) || lua_isnil(L, -2) || !lua_equal(L, -1, -2)) {
lua_pop(L, 2);
return NULL;
}
lua_pop(L, 2);
return *(liAction**) lua_touserdata(L, ndx);
}
static int lua_action_gc(lua_State *L) {
liServer *srv;
liLuaState *LL = li_lua_state_get(L);
@ -35,6 +20,35 @@ static int lua_action_gc(lua_State *L) {
return 0;
}
static HEDLEY_NEVER_INLINE void init_action_mt(liServer *srv, lua_State *L) {
lua_pushlightuserdata(L, srv);
lua_pushcclosure(L, lua_action_gc, 1);
lua_setfield(L, -2, "__gc");
}
static void lua_push_action_metatable(liServer *srv, lua_State *L) {
if (li_lua_new_protected_metatable(L, LUA_ACTION)) {
init_action_mt(srv, L);
}
}
void li_lua_init_action_mt(liServer *srv, lua_State *L) {
lua_push_action_metatable(srv, L);
lua_pop(L, 1);
}
liAction* li_lua_get_action(lua_State *L, int ndx) {
if (!lua_isuserdata(L, ndx)) return NULL;
if (!lua_getmetatable(L, ndx)) return NULL;
luaL_getmetatable(L, LUA_ACTION);
if (lua_isnil(L, -1) || lua_isnil(L, -2) || !lua_equal(L, -1, -2)) {
lua_pop(L, 2);
return NULL;
}
lua_pop(L, 2);
return *(liAction**) lua_touserdata(L, ndx);
}
int li_lua_push_action(liServer *srv, lua_State *L, liAction *a) {
liAction **pa;
@ -46,12 +60,7 @@ int li_lua_push_action(liServer *srv, lua_State *L, liAction *a) {
pa = (liAction**) lua_newuserdata(L, sizeof(liAction*));
*pa = a;
if (luaL_newmetatable(L, LUA_ACTION)) {
lua_pushlightuserdata(L, srv);
lua_pushcclosure(L, lua_action_gc, 1);
lua_setfield(L, -2, "__gc");
}
lua_push_action_metatable(srv, L);
lua_setmetatable(L, -2);
return 1;
}
@ -176,6 +185,7 @@ liAction* li_lua_make_action(lua_State *L, int ndx) {
lua_newtable(L); /* +1 */
/* new mt */
lua_newtable(L); /* +1 */
/* TODO: protect metatable? */
lua_getfield(L, LUA_REGISTRYINDEX, LI_LUA_REGISTRY_GLOBALS); /* +1 */
lua_setfield(L, -2, "__index"); /* -1 */
lua_setmetatable(L, -2); /* -1 */

1
src/main/base_lua.c

@ -4,7 +4,6 @@
#ifdef HAVE_LUA_H
# include <lighttpd/core_lua.h>
# include <lualib.h>
# include <lauxlib.h>
#endif
#ifdef HAVE_LUA_H

38
src/main/chunk_lua.c

@ -1,16 +1,20 @@
#include <lighttpd/core_lua.h>
#include <lualib.h>
#include <lauxlib.h>
#include <sys/stat.h>
#define LUA_CHUNK "liChunk*"
#define LUA_CHUNKQUEUE "liChunkQueue*"
static void init_chunk_mt(lua_State *L) {
static HEDLEY_NEVER_INLINE void init_chunk_mt(lua_State *L) {
/* TODO */
UNUSED(L);
}
static void lua_push_chunk_metatable(lua_State *L) {
if (li_lua_new_protected_metatable(L, LUA_CHUNK)) {
init_chunk_mt(L);
}
}
typedef int (*lua_ChunkQueue_Attrib)(liChunkQueue *cq, lua_State *L);
@ -259,19 +263,21 @@ static const luaL_Reg chunkqueue_mt[] = {
{ NULL, NULL }
};
static void init_chunkqueue_mt(lua_State *L) {
static HEDLEY_NEVER_INLINE void init_chunkqueue_mt(lua_State *L) {
luaL_register(L, NULL, chunkqueue_mt);
}
void li_lua_init_chunk_mt(lua_State *L) {
if (luaL_newmetatable(L, LUA_CHUNK)) {
init_chunk_mt(L);
static void lua_push_chunkqueue_metatable(lua_State *L) {
if (li_lua_new_protected_metatable(L, LUA_CHUNKQUEUE)) {
init_chunkqueue_mt(L);
}
}
void li_lua_init_chunk_mt(lua_State *L) {
lua_push_chunk_metatable(L);
lua_pop(L, 1);
if (luaL_newmetatable(L, LUA_CHUNKQUEUE)) {
init_chunkqueue_mt(L);
}
lua_push_chunkqueue_metatable(L);
lua_pop(L, 1);
}
@ -298,10 +304,7 @@ int li_lua_push_chunk(lua_State *L, liChunk *c) {
pc = (liChunk**) lua_newuserdata(L, sizeof(liChunk*));
*pc = c;
if (luaL_newmetatable(L, LUA_CHUNK)) {
init_chunk_mt(L);
}
lua_push_chunk_metatable(L);
lua_setmetatable(L, -2);
return 1;
}
@ -329,10 +332,7 @@ int li_lua_push_chunkqueue(lua_State *L, liChunkQueue *cq) {
pcq = (liChunkQueue**) lua_newuserdata(L, sizeof(liChunkQueue*));
*pcq = cq;
if (luaL_newmetatable(L, LUA_CHUNKQUEUE)) {
init_chunkqueue_mt(L);
}
lua_push_chunkqueue_metatable(L);
lua_setmetatable(L, -2);
return 1;
}

88
src/main/condition_lua.c

@ -1,10 +1,8 @@
#include <lighttpd/core_lua.h>
#include <lighttpd/condition_lua.h>
#include <lighttpd/value_lua.h>
#include <lualib.h>
#include <lauxlib.h>
#define LUA_CONDITION "liCondition*"
#define LUA_COND_LVALUE "liConditionLValue*"
#define LUA_COND_LVALUE_T "liCondLValue"
@ -113,9 +111,13 @@ static int lua_cond_lvalue_gc(lua_State *L) {
/* new metatables and push */
static HEDLEY_NEVER_INLINE void init_condition_mt(liServer *srv, lua_State *L) {
lua_mt_register_srv(srv, L, "__gc", lua_condition_gc);
}
static void lua_push_condition_metatable(liServer *srv, lua_State *L) {
if (luaL_newmetatable(L, LUA_CONDITION)) {
lua_mt_register_srv(srv, L, "__gc", lua_condition_gc);
if (li_lua_new_protected_metatable(L, LUA_CONDITION)) {
init_condition_mt(srv, L);
}
}
@ -131,7 +133,6 @@ int li_lua_push_condition(liServer *srv, lua_State *L, liCondition *c) {
*pc = c;
lua_push_condition_metatable(srv, L);
lua_setmetatable(L, -2);
return 1;
}
@ -193,31 +194,35 @@ static int lua_cond_lvalue_cmp(lua_State *L) {
return 0;
}
static HEDLEY_NEVER_INLINE void init_cond_lvalue_mt(liServer *srv, lua_State *L) {
lua_mt_register(L, "__gc", lua_cond_lvalue_gc);
lua_mt_register(L, "__tostring", lua_cond_lvalue_tostring);
lua_mt_register_cmp(srv, L, "eq", lua_cond_lvalue_cmp, LI_CONFIG_COND_EQ);
lua_mt_register_cmp(srv, L, "ne", lua_cond_lvalue_cmp, LI_CONFIG_COND_NE);
lua_mt_register_cmp(srv, L, "prefix", lua_cond_lvalue_cmp, LI_CONFIG_COND_PREFIX);
lua_mt_register_cmp(srv, L, "notprefix", lua_cond_lvalue_cmp, LI_CONFIG_COND_NOPREFIX);
lua_mt_register_cmp(srv, L, "suffix", lua_cond_lvalue_cmp, LI_CONFIG_COND_SUFFIX);
lua_mt_register_cmp(srv, L, "notsuffix", lua_cond_lvalue_cmp, LI_CONFIG_COND_NOSUFFIX);
lua_mt_register_cmp(srv, L, "match", lua_cond_lvalue_cmp, LI_CONFIG_COND_MATCH);
lua_mt_register_cmp(srv, L, "nomatch", lua_cond_lvalue_cmp, LI_CONFIG_COND_NOMATCH);
lua_mt_register_cmp(srv, L, "ip", lua_cond_lvalue_cmp, LI_CONFIG_COND_IP);
lua_mt_register_cmp(srv, L, "notip", lua_cond_lvalue_cmp, LI_CONFIG_COND_NOTIP);
lua_mt_register_cmp(srv, L, "gt", lua_cond_lvalue_cmp, LI_CONFIG_COND_GT);
lua_mt_register_cmp(srv, L, "ge", lua_cond_lvalue_cmp, LI_CONFIG_COND_GE);
lua_mt_register_cmp(srv, L, "lt", lua_cond_lvalue_cmp, LI_CONFIG_COND_LT);
lua_mt_register_cmp(srv, L, "le", lua_cond_lvalue_cmp, LI_CONFIG_COND_LE);
lua_mt_register_cmp(srv, L, "is", lua_cond_lvalue_bool, LI_CONFIG_COND_EQ);
lua_mt_register_cmp(srv, L, "isnot", lua_cond_lvalue_bool, LI_CONFIG_COND_NE);
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
}
static void lua_push_cond_lvalue_metatable(liServer *srv, lua_State *L) {
if (luaL_newmetatable(L, LUA_COND_LVALUE)) {
lua_mt_register(L, "__gc", lua_cond_lvalue_gc);
lua_mt_register(L, "__tostring", lua_cond_lvalue_tostring);
lua_mt_register_cmp(srv, L, "eq", lua_cond_lvalue_cmp, LI_CONFIG_COND_EQ);
lua_mt_register_cmp(srv, L, "ne", lua_cond_lvalue_cmp, LI_CONFIG_COND_NE);
lua_mt_register_cmp(srv, L, "prefix", lua_cond_lvalue_cmp, LI_CONFIG_COND_PREFIX);
lua_mt_register_cmp(srv, L, "notprefix", lua_cond_lvalue_cmp, LI_CONFIG_COND_NOPREFIX);
lua_mt_register_cmp(srv, L, "suffix", lua_cond_lvalue_cmp, LI_CONFIG_COND_SUFFIX);
lua_mt_register_cmp(srv, L, "notsuffix", lua_cond_lvalue_cmp, LI_CONFIG_COND_NOSUFFIX);
lua_mt_register_cmp(srv, L, "match", lua_cond_lvalue_cmp, LI_CONFIG_COND_MATCH);
lua_mt_register_cmp(srv, L, "nomatch", lua_cond_lvalue_cmp, LI_CONFIG_COND_NOMATCH);
lua_mt_register_cmp(srv, L, "ip", lua_cond_lvalue_cmp, LI_CONFIG_COND_IP);
lua_mt_register_cmp(srv, L, "notip", lua_cond_lvalue_cmp, LI_CONFIG_COND_NOTIP);
lua_mt_register_cmp(srv, L, "gt", lua_cond_lvalue_cmp, LI_CONFIG_COND_GT);
lua_mt_register_cmp(srv, L, "ge", lua_cond_lvalue_cmp, LI_CONFIG_COND_GE);
lua_mt_register_cmp(srv, L, "lt", lua_cond_lvalue_cmp, LI_CONFIG_COND_LT);
lua_mt_register_cmp(srv, L, "le", lua_cond_lvalue_cmp, LI_CONFIG_COND_LE);
lua_mt_register_cmp(srv, L, "is", lua_cond_lvalue_bool, LI_CONFIG_COND_EQ);
lua_mt_register_cmp(srv, L, "isnot", lua_cond_lvalue_bool, LI_CONFIG_COND_NE);
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
if (li_lua_new_protected_metatable(L, LUA_COND_LVALUE)) {
init_cond_lvalue_mt(srv, L);
}
}
@ -228,7 +233,6 @@ static int lua_push_cond_lvalue(liServer *srv, lua_State *L, liConditionLValue *
*pv = lvalue;
lua_push_cond_lvalue_metatable(srv, L);
lua_setmetatable(L, -2);
return 1;
}
@ -252,13 +256,28 @@ static int lua_cond_lvalue_t_index(lua_State *L) {
return 1;
}
static HEDLEY_NEVER_INLINE void init_cond_lvalue_t_mt(liServer *srv, lua_State *L) {
lua_mt_register(L, "__tostring", lua_cond_lvalue_t_tostring);
lua_mt_register_srv(srv, L, "__index", lua_cond_lvalue_t_index);
}
static void lua_push_cond_lvalue_t_metatable(liServer *srv, lua_State *L) {
if (luaL_newmetatable(L, LUA_COND_LVALUE_T)) {
lua_mt_register(L, "__tostring", lua_cond_lvalue_t_tostring);
lua_mt_register_srv(srv, L, "__index", lua_cond_lvalue_t_index);
if (li_lua_new_protected_metatable(L, LUA_COND_LVALUE_T)) {
init_cond_lvalue_t_mt(srv, L);
}
}
void li_lua_init_condition_mt(liServer *srv, lua_State *L) {
lua_push_condition_metatable(srv, L);
lua_pop(L, 1);
lua_push_cond_lvalue_metatable(srv, L);
lua_pop(L, 1);
lua_push_cond_lvalue_t_metatable(srv, L);
lua_pop(L, 1);
}
/* cond_lvalue_t */
static int lua_push_cond_lvalue_t(liServer *srv, lua_State *L, liCondLValue t) {
@ -268,7 +287,6 @@ static int lua_push_cond_lvalue_t(liServer *srv, lua_State *L, liCondLValue t) {
*pt = t;
lua_push_cond_lvalue_t_metatable(srv, L);
lua_setmetatable(L, -2);
return 1;
}

28
src/main/config_lua.c

@ -6,9 +6,6 @@
#include <lighttpd/core_lua.h>
#include <lualib.h>
#include <lauxlib.h>
typedef int (*LuaWrapper)(liServer *srv, liWorker *wrk, lua_State *L, const char *key);
static liValue* lua_params_to_value(liServer *srv, lua_State *L) {
@ -49,26 +46,30 @@ static int _lua_dynamic_hash_index_call(lua_State *L) {
static int _lua_dynamic_hash_index(lua_State *L) {
int key_ndx;
lua_pushvalue(L, lua_upvalueindex(4));
/* upvalues: 1: srv, 2: wrk, 3: "wrapper", 4: key prefix */
/* concat key prefix and new sub key */
lua_pushvalue(L, lua_upvalueindex(4)); /* key prefix */
lua_pushvalue(L, 2);
lua_concat(L, 2);
key_ndx = lua_gettop(L);
lua_newtable(L); /* result */
lua_newuserdata(L, 0); /* result: zero-sized userdata object */
lua_newtable(L); /* meta table */
li_lua_protect_metatable(L);
/* call method */
lua_pushvalue(L, lua_upvalueindex(1));
lua_pushvalue(L, lua_upvalueindex(2));
lua_pushvalue(L, lua_upvalueindex(3));
lua_pushvalue(L, lua_upvalueindex(1)); /* srv */
lua_pushvalue(L, lua_upvalueindex(2)); /* wrk */
lua_pushvalue(L, lua_upvalueindex(3)); /* wrapper */
lua_pushvalue(L, key_ndx);
lua_pushcclosure(L, _lua_dynamic_hash_index_call, 4);
lua_setfield(L, -2, "__call");
/* index for "nested" keys */
lua_pushvalue(L, lua_upvalueindex(1));
lua_pushvalue(L, lua_upvalueindex(2));
lua_pushvalue(L, lua_upvalueindex(3));
lua_pushvalue(L, lua_upvalueindex(1)); /* srv */
lua_pushvalue(L, lua_upvalueindex(2)); /* wrk */
lua_pushvalue(L, lua_upvalueindex(3)); /* wrapper */
lua_pushvalue(L, key_ndx); /* append a "." to the current key for nesting */
lua_pushstring(L, ".");
lua_concat(L, 2);
@ -81,14 +82,17 @@ static int _lua_dynamic_hash_index(lua_State *L) {
}
static void lua_push_dynamic_hash(liServer *srv, liWorker *wrk, lua_State *L, LuaWrapper wrapper) {
lua_newtable(L);
lua_newuserdata(L, 0); /* result: zero-sized userdata object */
lua_newtable(L); /* meta table */
li_lua_protect_metatable(L);
lua_pushlightuserdata(L, srv);
lua_pushlightuserdata(L, wrk);
lua_pushlightuserdata(L, (void*)(intptr_t) wrapper);
lua_pushstring(L, ""); /* nesting starts at "root" with empty string */
lua_pushcclosure(L, _lua_dynamic_hash_index, 4);
lua_setfield(L, -2, "__index");
lua_setmetatable(L, -2);
}

2
src/main/config_parser.rl

@ -120,7 +120,7 @@ struct liConditionTree {
liConditionTree *left, *right;
};
static liConfigToken tokenizer_error(liConfigTokenizerContext *ctx, GError **error, const char *fmt, ...) G_GNUC_PRINTF(3, 4);
static liConfigToken tokenizer_error(liConfigTokenizerContext *ctx, GError **error, const char *fmt, ...) HEDLEY_PRINTF_FORMAT(3, 4);
GQuark li_config_error_quark(void) {
return g_quark_from_string("li-config-error-quark");

43
src/main/core_lua.c

@ -1,8 +1,8 @@
#include <lighttpd/core_lua.h>
#include <lualib.h>
#include <lauxlib.h>
#include <lighttpd/actions_lua.h>
#include <lighttpd/condition_lua.h>
#include <lighttpd/value_lua.h>
liLuaState *li_lua_state_get(lua_State *L) {
liLuaState *LL;
@ -315,7 +315,7 @@ static int li_lua_kvl_to_table(lua_State *L) {
}
#endif
static void lua_push_constants(lua_State *L, int ndx) {
static void li_lua_push_lighty_constants(lua_State *L, int ndx) {
lua_pushinteger(L, LI_HANDLER_GO_ON);
lua_setfield(L, ndx, "HANDLER_GO_ON");
lua_pushinteger(L, LI_HANDLER_COMEBACK);
@ -330,15 +330,22 @@ void li_lua_init2(liLuaState *LL, liServer *srv, liWorker *wrk) {
lua_State *L = LL->L;
li_lua_init_chunk_mt(L);
li_lua_init_coninfo_mt(L);
li_lua_init_environment_mt(L);
li_lua_init_filter_mt(L);
li_lua_init_http_headers_mt(L);
li_lua_init_physical_mt(L);
li_lua_init_request_mt(L);
li_lua_init_response_mt(L);
li_lua_init_vrequest_mt(L);
li_lua_init_stat_mt(L);
li_lua_init_subrequest_mt(L);
li_lua_init_virtualrequest_mt(L);
if (NULL == wrk) {
/* these should only be used in the "main" lua context */
li_lua_init_action_mt(srv, L);
li_lua_init_condition_mt(srv, L);
li_lua_init_value_mt(L);
}
/* prefer closure, but just in case */
lua_pushlightuserdata(L, srv);
@ -348,9 +355,16 @@ void li_lua_init2(liLuaState *LL, liServer *srv, liWorker *wrk) {
lua_setfield(L, LUA_REGISTRYINDEX, LI_LUA_REGISTRY_WORKER);
}
lua_newtable(L); /* lighty. */
/* create read-only lighty "table" (zero-sized userdata object) */
lua_newuserdata(L, 0); /* lighty. */
lua_newtable(L); /* metatable(lighty) */
/* prevent tampering with the metatable */
li_lua_protect_metatable(L);
lua_newtable(L); /* metatable(lighty).__index */
/* create lighty.filter_in and lighty.filter_out: */
li_lua_init_filters(L, srv);
/* lighty.print (and lighty.error and global print) */
lua_pushlightuserdata(L, srv);
lua_pushlightuserdata(L, wrk);
lua_pushcclosure(L, li_lua_error, 2);
@ -360,21 +374,25 @@ void li_lua_init2(liLuaState *LL, liServer *srv, liWorker *wrk) {
lua_setfield(L, -3, "error");
lua_setfield(L, -2, "print");
/* lighty.warning */
lua_pushlightuserdata(L, srv);
lua_pushlightuserdata(L, wrk);
lua_pushcclosure(L, li_lua_warning, 2);
lua_setfield(L, -2, "warning");
/* lighty.info */
lua_pushlightuserdata(L, srv);
lua_pushlightuserdata(L, wrk);
lua_pushcclosure(L, li_lua_info, 2);
lua_setfield(L, -2, "info");
/* lighty.debug */
lua_pushlightuserdata(L, srv);
lua_pushlightuserdata(L, wrk);
lua_pushcclosure(L, li_lua_debug, 2);
lua_setfield(L, -2, "debug");
/* lighty.{md5,sha1,sha256} */
lua_pushcclosure(L, li_lua_md5, 0);
lua_setfield(L, -2, "md5");
lua_pushcclosure(L, li_lua_sha1, 0);
@ -382,11 +400,17 @@ void li_lua_init2(liLuaState *LL, liServer *srv, liWorker *wrk) {
lua_pushcclosure(L, li_lua_sha256, 0);
lua_setfield(L, -2, "sha256");
/* lighty.path_simplify */
lua_pushcclosure(L, li_lua_path_simplify, 0);
lua_setfield(L, -2, "path_simplify");
lua_push_constants(L, -2);
li_lua_push_lighty_constants(L, -2);
/* set __index for metatable(lighty) */
lua_setfield(L, -2, "__index");
/* associate metatable(lighty) */
lua_setmetatable(L, -2);
/* store "lighty" object in globals */
lua_setfield(L, LUA_GLOBALSINDEX, "lighty");
li_lua_store_globals(L);
@ -404,6 +428,7 @@ void li_lua_new_globals(lua_State *L) {
/* metatable for new global env, link old globals as readonly */
lua_newtable(L); /* +1 */
/* TODO: protect metatable? */
lua_pushvalue(L, LUA_GLOBALSINDEX); /* +1 */
lua_setfield(L, -2, "__index"); /* -1 */
lua_setmetatable(L, -2); /* -1 */

18
src/main/environment_lua.c

@ -1,9 +1,6 @@
#include <lighttpd/core_lua.h>
#include <lualib.h>
#include <lauxlib.h>
#define LUA_ENVIRONMENT "liEnvironment*"
static int lua_environment_get(lua_State *L) {
@ -113,14 +110,18 @@ static const luaL_Reg environment_mt[] = {
{ NULL, NULL }
};
static void init_env_mt(lua_State *L) {
static HEDLEY_NEVER_INLINE void init_env_mt(lua_State *L) {
luaL_register(L, NULL, environment_mt);
}
void li_lua_init_environment_mt(lua_State *L) {
if (luaL_newmetatable(L, LUA_ENVIRONMENT)) {
static void lua_push_environment_metatable(lua_State *L) {
if (li_lua_new_protected_metatable(L, LUA_ENVIRONMENT)) {
init_env_mt(L);
}
}
void li_lua_init_environment_mt(lua_State *L) {
lua_push_environment_metatable(L);
lua_pop(L, 1);
}
@ -147,10 +148,7 @@ int li_lua_push_environment(lua_State *L, liEnvironment *env) {
penv = (liEnvironment**) lua_newuserdata(L, sizeof(liEnvironment*));
*penv = env;
if (luaL_newmetatable(L, LUA_ENVIRONMENT)) {
init_env_mt(L);
}
lua_push_environment_metatable(L);
lua_setmetatable(L, -2);
return 1;
}

18
src/main/filters_lua.c

@ -3,9 +3,6 @@
#include <lighttpd/core_lua.h>
#include <lighttpd/actions_lua.h>
#include <lualib.h>
#include <lauxlib.h>
#define LUA_FILTER "liFilter*"
typedef int (*lua_Filter_Attrib)(liFilter *f, lua_State *L);
@ -111,14 +108,18 @@ static const luaL_Reg filter_mt[] = {
{ NULL, NULL }
};
static void init_filter_mt(lua_State *L) {
static HEDLEY_NEVER_INLINE void init_filter_mt(lua_State *L) {
luaL_register(L, NULL, filter_mt);
}
void li_lua_init_filter_mt(lua_State *L) {
if (luaL_newmetatable(L, LUA_FILTER)) {
static void lua_push_filter_metatable(lua_State *L) {
if (li_lua_new_protected_metatable(L, LUA_FILTER)) {
init_filter_mt(L);
}
}
void li_lua_init_filter_mt(lua_State *L) {
lua_push_filter_metatable(L);
lua_pop(L, 1);
}
@ -145,10 +146,7 @@ int li_lua_push_filter(lua_State *L, liFilter *f) {
pf = (liFilter**) lua_newuserdata(L, sizeof(liFilter*));
*pf = f;
if (luaL_newmetatable(L, LUA_FILTER)) {
init_filter_mt(L);
}
lua_push_filter_metatable(L);
lua_setmetatable(L, -2);
return 1;
}

4
src/main/http_headers.c

@ -267,7 +267,7 @@ gboolean li_http_header_tokenizer_next(liHttpHeaderTokenizer *tokenizer, GString
++pos;
if (pos >= len) return FALSE; /* no character after backslash */
/* append whatever comes */
/* fallthrough */
HEDLEY_FALL_THROUGH;
default:
g_string_append_c(token, str[pos]);
break;
@ -285,7 +285,7 @@ quoted:
++pos;
if (pos >= len) return FALSE; /* no character after backslash */
/* append whatever comes */
/* fallthrough */
HEDLEY_FALL_THROUGH;
default:
g_string_append_c(token, str[pos]);
break;

18
src/main/http_headers_lua.c

@ -1,9 +1,6 @@
#include <lighttpd/core_lua.h>
#include <lualib.h>
#include <lauxlib.h>
#define LUA_HTTPHEADERS "liHttpHeaders*"
static int lua_http_headers_get(lua_State *L) {
@ -201,14 +198,18 @@ static const luaL_Reg http_headers_mt[] = {
{ NULL, NULL }
};
static void init_http_headers_mt(lua_State *L) {
static HEDLEY_NEVER_INLINE void init_http_headers_mt(lua_State *L) {
luaL_register(L, NULL, http_headers_mt);
}
void li_lua_init_http_headers_mt(lua_State *L) {
if (luaL_newmetatable(L, LUA_HTTPHEADERS)) {
static void lua_push_http_headers_metatable(lua_State *L) {
if (li_lua_new_protected_metatable(L, LUA_HTTPHEADERS)) {
init_http_headers_mt(L);
}
}
void li_lua_init_http_headers_mt(lua_State *L) {
lua_push_http_headers_metatable(L);
lua_pop(L, 1);
}
@ -235,10 +236,7 @@ int li_lua_push_http_headers(lua_State *L, liHttpHeaders *headers) {
pheaders = (liHttpHeaders**) lua_newuserdata(L, sizeof(liHttpHeaders*));
*pheaders = headers;
if (luaL_newmetatable(L, LUA_HTTPHEADERS)) {
init_http_headers_mt(L);
}
lua_push_http_headers_metatable(L);
lua_setmetatable(L, -2);
return 1;
}

4
src/main/log.c

@ -207,7 +207,7 @@ gboolean li_log_write_direct(liServer *srv, liWorker *wrk, GString *path, GStrin
log_entry->queue_link.next = NULL;
log_entry->queue_link.prev = NULL;
if (G_LIKELY(wrk)) {
if (HEDLEY_LIKELY(wrk)) {
/* push onto local worker log queue */
g_queue_push_tail_link(&wrk->logs.log_queue, &log_entry->queue_link);
} else {
@ -273,7 +273,7 @@ gboolean li_log_write(liServer *srv, liWorker *wrk, liLogContext *context, liLog
log_entry->queue_link.next = NULL;
log_entry->queue_link.prev = NULL;
if (G_LIKELY(wrk)) {
if (HEDLEY_LIKELY(wrk)) {
/* push onto local worker log queue */
g_queue_push_tail_link(&wrk->logs.log_queue, &log_entry->queue_link);
} else {

2
src/main/network.c

@ -98,7 +98,7 @@ liNetworkStatus li_network_read(int fd, liChunkQueue *cq, goffset read_max, liBu
if (NULL != buffer) {
if (buf != NULL) {
/* use last buffer as *buffer; they should be the same anyway */
if (G_UNLIKELY(buf != *buffer)) {
if (HEDLEY_UNLIKELY(buf != *buffer)) {
li_buffer_acquire(buf);
li_buffer_release(*buffer);
*buffer = buf;

8
src/main/pattern.c

@ -240,7 +240,7 @@ void li_pattern_free(liPattern *pattern) {
part = &g_array_index(arr, liPatternPart, i);
switch (part->type) {
case PATTERN_STRING: g_string_free(part->data.str, TRUE); break;
case PATTERN_VAR_ENCODED: /* fall through */
case PATTERN_VAR_ENCODED: HEDLEY_FALL_THROUGH;
case PATTERN_VAR: li_condition_lvalue_release(part->data.lvalue); break;
default: break;
}
@ -277,7 +277,7 @@ void li_pattern_eval(liVRequest *vr, GString *dest, liPattern *pattern, liPatter
break;
case PATTERN_VAR_ENCODED:
encoded = TRUE;
/* fall through */
HEDLEY_FALL_THROUGH;
case PATTERN_VAR:
if (vr == NULL) continue;
@ -305,7 +305,7 @@ void li_pattern_array_cb(GString *pattern_result, guint from, guint to, gpointer
if (NULL == a || 0 == a->len) return;
if (G_LIKELY(from <= to)) {
if (HEDLEY_LIKELY(from <= to)) {
to = MIN(to, a->len - 1);
for (i = from; i <= to; i++) {
GString *str = g_array_index(a, GString*, i);
@ -331,7 +331,7 @@ void li_pattern_regex_cb(GString *pattern_result, guint from, guint to, gpointer
if (NULL == match_info) return;
if (G_LIKELY(from <= to)) {
if (HEDLEY_LIKELY(from <= to)) {
to = MIN(to, G_MAXINT);
for (i = from; i <= to; i++) {
if (g_match_info_fetch_pos(match_info, (gint) i, &start_pos, &end_pos)) {

18
src/main/physical_lua.c

@ -1,9 +1,6 @@
#include <lighttpd/core_lua.h>
#include <lualib.h>
#include <lauxlib.h>
#define LUA_PHYSICAL "liPhysical*"
typedef int (*lua_Physical_Attrib)(liPhysical *phys, lua_State *L);
@ -127,14 +124,18 @@ static const luaL_Reg physical_mt[] = {
{ NULL, NULL }
};
static void init_physical_mt(lua_State *L) {
static HEDLEY_NEVER_INLINE void init_physical_mt(lua_State *L) {
luaL_register(L, NULL, physical_mt);
}
void li_lua_init_physical_mt(lua_State *L) {
if (luaL_newmetatable(L, LUA_PHYSICAL)) {
static void lua_push_physical_metatable(lua_State *L) {
if (li_lua_new_protected_metatable(L, LUA_PHYSICAL)) {
init_physical_mt(L);
}
}
void li_lua_init_physical_mt(lua_State *L) {
lua_push_physical_metatable(L);
lua_pop(L, 1);
}
@ -161,10 +162,7 @@ int li_lua_push_physical(lua_State *L, liPhysical *phys) {
pphys = (liPhysical**) lua_newuserdata(L, sizeof(liPhysical*));
*pphys = phys;
if (luaL_newmetatable(L, LUA_PHYSICAL)) {
init_physical_mt(L);
}
lua_push_physical_metatable(L);
lua_setmetatable(L, -2);
return 1;
}

37
src/main/request_lua.c

@ -1,9 +1,6 @@
#include <lighttpd/core_lua.h>
#include <lualib.h>
#include <lauxlib.h>
#define LUA_REQUEST "liRequest*"
#define LUA_REQUESTURI "liRequestUri*"