Merge r1305586 from trunk:

Be more verbose when logging syntax errors

Submitted by: sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1331413 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 571ed0ed345af7151fa57c0513eb26491a7c734b..3ccfcf5f6e6ab2e8a7b0addc74e8b33ab8d149a9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -103,11 +103,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4 patch: Trunk patch works
     +1: sf, jorton, jim
 
-  * mod_lua: Log better error message if parsing of a script fails (including
-    the line number of a syntax error!).
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1305586
-    2.4 patch: Trunk patch works
-    +1: sf, jorton, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c
index 7c383ca94a8b9846cd94c4fab06c6fdef193fba8..1ffe5e2559100f43d8b46c23dade406a1cad5bec 100644 (file)
--- a/modules/lua/lua_vmprep.c
+++ b/modules/lua/lua_vmprep.c
@@ -357,24 +357,10 @@ static apr_status_t vm_construct(void **vm, void *params, apr_pool_t *lifecycle_
             "loading lua file %s", spec->file);
         rc = luaL_loadfile(L, spec->file);
         if (rc != 0) {
-            char *err;
-            switch (rc) {
-                case LUA_ERRSYNTAX:
-                    err = "syntax error";
-                    break;
-                case LUA_ERRMEM:
-                    err = "memory allocation error";
-                    break;
-                case LUA_ERRFILE:
-                    err = "error opening or reading file";
-                    break;
-                default:
-                    err = "unknown error";
-                    break;
-            }
             ap_log_perror(APLOG_MARK, APLOG_ERR, 0, lifecycle_pool, APLOGNO(01482)
-                "Loading lua file %s: %s",
-                spec->file, err);
+                          "Error loading %s: %s", spec->file,
+                          rc == LUA_ERRMEM ? "memory allocation error"
+                                           : lua_tostring(L, 0));
             return APR_EBADF;
         }
         lua_pcall(L, 0, LUA_MULTRET, 0);