Changeset 61 in Main for trunk

Timestamp:

Sep 18, 2024, 9:45:02 PM (2 months ago)

Author:

Nishi

Message:

add ServerRoot

Location:

trunk

Files:

• Server/config.c (modified) (1 diff)
• Server/install.nsi (modified) (2 diffs)
• Server/server.c (modified) (1 diff)
• example-win.conf (modified) (1 diff, 1 prop)

trunk/Server/config.c

@@ -233 +233 @@
                                                         current->sslcert = cm_strdup(r[1]);
                                                 }
+                                        } else if(cm_strcaseequ(r[0], "ServerRoot")) {
+                                                if(r[1] == NULL) {
+                                                        cm_log("Config", "Missing path at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        chdir(r[1]);
+                                                }
                                         } else if(cm_strcaseequ(r[0], "DocumentRoot")) {
                                                 if(r[1] == NULL) {

trunk/Server/install.nsi

@@ -14 +14 @@
         CreateDirectory "$INSTDIR\www"
         CreateDirectory "$INSTDIR\www\icons"
+        CreateDirectory "$INSTDIR\modules"
         CreateDirectory "$INSTDIR\bin"
+        SetOutPath "$INSTDIR"
+        File /oname=LICENSE.txt "../LICENSE"
         SetOutPath "$INSTDIR\bin"
         File "tewi.exe"
+        SetOutPath "$INSTDIR\modules"
+        File "../Module/*.dll"
         SetOutPath "$INSTDIR\etc"
-        File /oname=tewi.conf.default "../example-win.conf"
+        SetOverWrite off
+        File /oname=tewi.conf "../example-win.conf"
         SetOutPath "$INSTDIR\www"
         File /oname=index.html "../itworks.html"
         SetOutPath "$INSTDIR\www\icons"
         File "../Icons/*.png"
+        SetOverWrite on
 
         CreateDirectory "$SMPROGRAMS\Tewi HTTPd"
+        CreateShortcut "$SMPROGRAMS\Tewi HTTPd\License.lnk" "$INSTDIR\LICENSE.txt" ""
         CreateShortcut "$SMPROGRAMS\Tewi HTTPd\Start Tewi HTTPd.lnk" "$INSTDIR\bin\tewi.exe" ""
         CreateShortcut "$SMPROGRAMS\Tewi HTTPd\Start Tewi HTTPd (verbose).lnk" "$INSTDIR\bin\tewi.exe" "-v"
@@ -33 +41 @@
 
         WriteUninstaller "$INSTDIR\uninstall.exe"
-
-        MessageBox MB_ICONEXCLAMATION|MB_OK "Example config is installed as $INSTDIR\etc\tewi.conf.default,$\r$\nBut Tewi HTTPd will try to use $INSTDIR\etc\tewi.conf."
 SectionEnd
 

trunk/Server/server.c

@@ -483 +483 @@
                                 } else if(S_ISDIR(st.st_mode)) {
                                         if(req.path[strlen(req.path) - 1] != '/') {
+                                                cm_log("Server", "Accessing directory without the slash at the end");
                                                 char* headers[3] = {"Location", cm_strcat(req.path, "/"), NULL};
                                                 _tw_process_page(s, sock, tw_http_status(308), NULL, NULL, NULL, 0, headers, 0, 0);

trunk/example-win.conf

@@ -1 +1 @@
 # $Id$
 # This is an example config
+
+ServerRoot C:/Tewi
 
 Listen 80