summaryrefslogtreecommitdiff
path: root/libproxy/proxy.cpp
diff options
context:
space:
mode:
authornpmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56>2010-01-24 04:11:17 +0000
committernpmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56>2010-01-24 04:11:17 +0000
commit32e57e36c74c1415209fc8fa1162e9220bc43773 (patch)
tree6667e6b8cd6ed6def3a204bb22d76d4e62412b50 /libproxy/proxy.cpp
parent478c9d1026263f1f69aaf98424a25cc4ea23b6af (diff)
downloadlibproxy-32e57e36c74c1415209fc8fa1162e9220bc43773.tar.gz
make builtin modules part of the module_manager api
git-svn-id: http://libproxy.googlecode.com/svn/trunk@502 c587cffe-e639-0410-9787-d7902ae8ed56
Diffstat (limited to 'libproxy/proxy.cpp')
-rw-r--r--libproxy/proxy.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/libproxy/proxy.cpp b/libproxy/proxy.cpp
index cd0fbac..c4d5a99 100644
--- a/libproxy/proxy.cpp
+++ b/libproxy/proxy.cpp
@@ -37,6 +37,11 @@ namespace googlecode {
namespace libproxy {
using namespace std;
+static const char* _builtin_modules[] = {
+ BUILTIN_MODULES
+ NULL
+};
+
class proxy_factory {
public:
proxy_factory();
@@ -119,6 +124,10 @@ proxy_factory::proxy_factory() {
setenv("_PX_CONFIG_ORDER", tmp.c_str(), 1);
}
+ // Load all builtin modules
+ for (int i=0 ; _builtin_modules[i] ; i++)
+ this->mm.load_builtin(_builtin_modules[i]);
+
// Load all modules
this->mm.load_dir(MODULEDIR);