1 files changed, 27 insertions, 8 deletions

diff --git a/modules/lua/lua_apr.c b/modules/lua/lua_apr.c
index 8a1dcf68..94761ba4 100644
--- a/modules/lua/lua_apr.c
+++ b/modules/lua/lua_apr.c
@@ -17,17 +17,18 @@
 
 #include "mod_lua.h"
 #include "lua_apr.h"
+APLOG_USE_MODULE(lua);
 
-apr_table_t *ap_lua_check_apr_table(lua_State *L, int index)
+req_table_t *ap_lua_check_apr_table(lua_State *L, int index)
 {
-    apr_table_t *t;
+    req_table_t* t;
     luaL_checkudata(L, index, "Apr.Table");
     t = lua_unboxpointer(L, index);
     return t;
 }
 
 
-void ap_lua_push_apr_table(lua_State *L, apr_table_t *t)
+void ap_lua_push_apr_table(lua_State *L, req_table_t *t)
 {
     lua_boxpointer(L, t);
     luaL_getmetatable(L, "Apr.Table");
@@ -36,19 +37,37 @@ void ap_lua_push_apr_table(lua_State *L, apr_table_t *t)
 
 static int lua_table_set(lua_State *L)
 {
-    apr_table_t    *t = ap_lua_check_apr_table(L, 1);
+    req_table_t    *t = ap_lua_check_apr_table(L, 1);
     const char     *key = luaL_checkstring(L, 2);
     const char     *val = luaL_checkstring(L, 3);
-
-    apr_table_set(t, key, val);
+    /* Unless it's the 'notes' table, check for newline chars */
+    /* t->r will be NULL in case of the connection notes, but since 
+       we aren't going to check anything called 'notes', we can safely 
+       disregard checking whether t->r is defined.
+    */
+    if (strcmp(t->n, "notes") && ap_strchr_c(val, '\n')) {
+        char *badchar;
+        char *replacement = apr_pstrdup(t->r->pool, val);
+        badchar = replacement;
+        while ( (badchar = ap_strchr(badchar, '\n')) ) {
+            *badchar = ' ';
+        }
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, t->r, 
+                APLOGNO(02614) "mod_lua: Value for '%s' in table '%s' contains newline!",
+                  key, t->n);
+        apr_table_set(t->t, key, replacement);
+    }
+    else {
+        apr_table_set(t->t, key, val);
+    }
     return 0;
 }
 
 static int lua_table_get(lua_State *L)
 {
-    apr_table_t    *t = ap_lua_check_apr_table(L, 1);
+    req_table_t    *t = ap_lua_check_apr_table(L, 1);
     const char     *key = luaL_checkstring(L, 2);
-    const char     *val = apr_table_get(t, key);
+    const char     *val = apr_table_get(t->t, key);
     lua_pushstring(L, val);
     return 1;
 }