You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by br...@apache.org on 2007/07/08 23:23:46 UTC
svn commit: r554445 - in /httpd/mod_wombat/branches/rework_object_wrappers:
apr_lua.c apr_lua.h config.h mod_wombat.c vmprep.c vmprep.h
Author: brianm
Date: Sun Jul 8 14:23:45 2007
New Revision: 554445
URL: http://svn.apache.org/viewvc?view=rev&rev=554445
Log:
This branch is very broken at the moment, but am starting to clean cruft
Modified:
httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.c
httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.h
httpd/mod_wombat/branches/rework_object_wrappers/config.h
httpd/mod_wombat/branches/rework_object_wrappers/mod_wombat.c
httpd/mod_wombat/branches/rework_object_wrappers/vmprep.c
httpd/mod_wombat/branches/rework_object_wrappers/vmprep.h
Modified: httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.c
URL: http://svn.apache.org/viewvc/httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.c?view=diff&rev=554445&r1=554444&r2=554445
==============================================================================
--- httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.c (original)
+++ httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.c Sun Jul 8 14:23:45 2007
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
#include "apr.h"
#include "apr_tables.h"
Modified: httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.h
URL: http://svn.apache.org/viewvc/httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.h?view=diff&rev=554445&r1=554444&r2=554445
==============================================================================
--- httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.h (original)
+++ httpd/mod_wombat/branches/rework_object_wrappers/apr_lua.h Sun Jul 8 14:23:45 2007
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
#ifndef _APR_LUA_H_
#define _APR_LUA_H_
Modified: httpd/mod_wombat/branches/rework_object_wrappers/config.h
URL: http://svn.apache.org/viewvc/httpd/mod_wombat/branches/rework_object_wrappers/config.h?view=diff&rev=554445&r1=554444&r2=554445
==============================================================================
--- httpd/mod_wombat/branches/rework_object_wrappers/config.h (original)
+++ httpd/mod_wombat/branches/rework_object_wrappers/config.h Sun Jul 8 14:23:45 2007
@@ -20,9 +20,9 @@
#ifndef APW_CONFIG_H
#define APW_CONFIG_H
-APR_DECLARE(const char*) apw_config_via_lua(cmd_parms *cmd, apw_dir_cfg *_cfg,
+/*APR_DECLARE(const char*) apw_config_via_lua(cmd_parms *cmd, apw_dir_cfg *_cfg,
const char *file, const char *function);
-
+*/
APR_DECLARE(void) apw_load_config_lmodule(lua_State *L);
APR_DECLARE(apr_status_t) apw_map_lua_handler(apw_dir_cfg *cfg,
Modified: httpd/mod_wombat/branches/rework_object_wrappers/mod_wombat.c
URL: http://svn.apache.org/viewvc/httpd/mod_wombat/branches/rework_object_wrappers/mod_wombat.c?view=diff&rev=554445&r1=554444&r2=554445
==============================================================================
--- httpd/mod_wombat/branches/rework_object_wrappers/mod_wombat.c (original)
+++ httpd/mod_wombat/branches/rework_object_wrappers/mod_wombat.c Sun Jul 8 14:23:45 2007
@@ -359,11 +359,6 @@
return NULL;
}
-static const char* register_lua_config(cmd_parms *cmd, void *_cfg, const char *file, const char *function) {
- apw_dir_cfg* cfg = (apw_dir_cfg*)_cfg;
- return apw_config_via_lua(cmd, cfg, file, function);
-}
-
static const char* register_lua_root(cmd_parms *cmd, void *_cfg, const char *root) {
// apw_dir_cfg* cfg = (apw_dir_cfg*)_cfg;
apw_server_cfg* cfg = ap_get_module_config(cmd->server->module_config, &wombat_module);
@@ -376,12 +371,8 @@
command_rec wombat_commands[] = {
- AP_INIT_TAKE2("LuaConfig", register_lua_config, NULL, OR_ALL,
- "Perform in-Lua Configuration"),
-
AP_INIT_TAKE1("LuaRoot", register_lua_root, NULL, OR_ALL,
"Specify the base path for resolving relative paths for mod_wombat directives"),
-
AP_INIT_TAKE1("LuaPackagePath", register_package_dir, NULL, OR_ALL,
"Add a directory to lua's package.path"),
Modified: httpd/mod_wombat/branches/rework_object_wrappers/vmprep.c
URL: http://svn.apache.org/viewvc/httpd/mod_wombat/branches/rework_object_wrappers/vmprep.c?view=diff&rev=554445&r1=554444&r2=554445
==============================================================================
--- httpd/mod_wombat/branches/rework_object_wrappers/vmprep.c (original)
+++ httpd/mod_wombat/branches/rework_object_wrappers/vmprep.c Sun Jul 8 14:23:45 2007
@@ -80,7 +80,7 @@
}
}
-void registerlib(lua_State* L, char* name, lua_CFunction f) {
+static void registerlib(lua_State* L, char* name, lua_CFunction f) {
lua_getglobal(L, "package");
lua_getfield(L, -1, "preload");
lua_pushcfunction(L, f);
@@ -89,7 +89,7 @@
}
-void open_lualibs(lua_State* L) {
+static void open_lualibs(lua_State* L) {
lua_cpcall(L, luaopen_base, NULL);
lua_cpcall(L, luaopen_package, NULL);
registerlib(L, "io", luaopen_io);
@@ -416,12 +416,6 @@
}
return L;
-}
-
-// returns NULL if the spec requires a request scope
-lua_State* apw_cgetvm(conn_rec *conn, apw_vm_spec *spec) {
-
- return NULL;
}
/**
Modified: httpd/mod_wombat/branches/rework_object_wrappers/vmprep.h
URL: http://svn.apache.org/viewvc/httpd/mod_wombat/branches/rework_object_wrappers/vmprep.h?view=diff&rev=554445&r1=554444&r2=554445
==============================================================================
--- httpd/mod_wombat/branches/rework_object_wrappers/vmprep.h (original)
+++ httpd/mod_wombat/branches/rework_object_wrappers/vmprep.h Sun Jul 8 14:23:45 2007
@@ -79,10 +79,10 @@
} apw_code_cache;
// remove and make static once out of mod_wombat.c
-void apw_openlibs(lua_State* L);
+// void apw_openlibs(lua_State* L);
// remove and make static once out of mod_wombat.c
-void apw_registerlib(lua_State* L, char* name, lua_CFunction f);
+// void apw_registerlib(lua_State* L, char* name, lua_CFunction f);
/**
* Fake out addition of the "apache2" module
@@ -95,9 +95,6 @@
* spec then a new one is created.
*/
lua_State* apw_rgetvm(request_rec *r, apw_vm_spec *spec);
-
-// returns NULL if the spec requires a request scope
-lua_State* apw_cgetvm(conn_rec *r, apw_vm_spec *spec);
// returns NULL if the spec requires a request scope or conn scope
lua_State* apw_sgetvm(server_rec *r, apw_vm_spec *spec);