From: Stefan Fritsch <sf@apache.org>
Date: Mon, 10 Sep 2012 18:06:48 +0000 (+0000)
Subject: Replace duplicate log msg numbers
X-Git-Tag: 2.5.0-alpha~6349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=533878b7c7b490722bbdfcc5831cb8b1af4872b9;p=apache

Replace duplicate log msg numbers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383013 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index ffcd151c41..f5052a2a28 100644
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-2328
+2334
diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c
index faa0afc052..02d030fbfb 100644
--- a/modules/lua/lua_vmprep.c
+++ b/modules/lua/lua_vmprep.c
@@ -486,11 +486,11 @@ AP_LUA_DECLARE(lua_State*)ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
     }
     if (tryCache == 0 && spec->scope != AP_LUA_SCOPE_ONCE) {
         int rc;
-        ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, lifecycle_pool, APLOGNO(01481)
+        ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, lifecycle_pool, APLOGNO(02332)
             "(re)loading lua file %s", spec->file);
         rc = luaL_loadfile(L, spec->file);
         if (rc != 0) {
-            ap_log_perror(APLOG_MARK, APLOG_ERR, 0, lifecycle_pool, APLOGNO(01482)
+            ap_log_perror(APLOG_MARK, APLOG_ERR, 0, lifecycle_pool, APLOGNO(02333)
                           "Error loading %s: %s", spec->file,
                           rc == LUA_ERRMEM ? "memory allocation error"
                                            : lua_tostring(L, 0));
diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
index e75ca32ddf..22620b5da9 100644
--- a/modules/lua/mod_lua.c
+++ b/modules/lua/mod_lua.c
@@ -336,7 +336,7 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil
             }
 
             if (!L) {
-                ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(01477)
+                ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(02328)
                                 "lua: Failed to obtain lua interpreter for %s %s",
                                 hook_spec->function_name, hook_spec->file_name);
                 ap_lua_release_state(L, spec, r);
@@ -345,7 +345,7 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil
             if (hook_spec->function_name != NULL) {
                 lua_getglobal(L, hook_spec->function_name);
                 if (!lua_isfunction(L, -1)) {
-                    ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(01478)
+                    ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(02329)
                                     "lua: Unable to find function %s in %s",
                                     hook_spec->function_name,
                                     hook_spec->file_name);
@@ -711,7 +711,7 @@ static int lua_map_handler(request_rec *r)
             L = ap_lua_get_lua_state(pool, spec, r);
 
             if (!L) {
-                ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(01477)
+                ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(02330)
                                 "lua: Failed to obtain lua interpreter for %s %s",
                                 function_name, filename);
                 ap_lua_release_state(L, spec, r);
@@ -721,7 +721,7 @@ static int lua_map_handler(request_rec *r)
             if (function_name != NULL) {
                 lua_getglobal(L, function_name);
                 if (!lua_isfunction(L, -1)) {
-                    ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(01478)
+                    ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(02331)
                                     "lua: Unable to find function %s in %s",
                                     function_name,
                                     filename);