fix some stuff

git-svn-id: file:///raid/svn-personal/tewi/trunk@127 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Server/config.c b/Server/config.c
index 9fd3fb0eef96d86c3fc9ce183fbbd1cfa045732f..1eb7cb9822e9ae0986cf848a32315825e8270a43 100644 (file)
--- a/Server/config.c
+++ b/Server/config.c
@@ -244,6 +244,8 @@ int tw_config_read(const char* path) {
                                                        stop = 1;
                                                } else {
                                                        chdir(r[1]);
+                                                       free(config.server_root);
+                                                       config.server_root = cm_strdup(r[1]);
                                                }
                                        } else if(cm_strcaseequ(r[0], "DocumentRoot")) {
                                                if(r[1] == NULL) {
@@ -295,6 +297,7 @@ int tw_config_read(const char* path) {
                                                                        break;
                                                                }
                                                        } else {
+                                                               cm_log("Config", "Could not load the module at line %d", ln);
                                                                stop = 1;
                                                                break;
                                                        }

diff --git a/Server/powered.gif b/Server/powered.gif
new file mode 100644 (file)
index 0000000..4586ce5
Binary files /dev/null and b/Server/powered.gif differ

diff --git a/example.conf b/example.conf
index 4dc759101b833b51dd2dae07e000b5f20285cb67..4b1ed3d39bf1f2d4b9af2b830f6124b631da94fa 100644 (file)
--- a/example.conf
+++ b/example.conf
@@ -1,7 +1,10 @@
 # $Id$
 # This is an example config
 
-#LoadModule /home/nishi/SVN/tewi/trunk/Module/mod_cgi.so
+ServerRoot /home/nishi/SVN/tewi/trunk
+
+#LoadModule Module/mod_cgi.so
+LoadModule Module/mod_proxy.so
 
 Listen 80
 ListenSSL 443
@@ -26,10 +29,4 @@ Readme README
 
 DocumentRoot /var/www
 
-BeginDirectory /
-       Allow all
-EndDirectory
-
-BeginDirectory /var/www/cgi-bin
-#      AllowCGI
-EndDirectory
+ProxyPass