Changeset 19 in Main for trunk

Timestamp:

Sep 14, 2024, 9:51:41 AM (2 months ago)

Author:

Nishi

Message:

add fallback option

Location:

trunk

Files:

• Server/config.c (modified) (2 diffs)
• Server/server.c (modified) (1 diff)
• Server/ssl.c (modified) (1 diff)
• Server/tw_config.h (modified) (1 diff)
• example.conf (modified) (1 diff)

trunk/Server/config.c

@@ -35 +35 @@
                 config.vhosts[i].sslkey = NULL;
                 config.vhosts[i].sslcert = NULL;
+                config.vhosts[i].root = NULL;
         }
         config.root.sslkey = NULL;
         config.root.sslcert = NULL;
+        config.root.root = NULL;
         config.vhost_count = 0;
         config.module_count = 0;
@@ -130 +132 @@
                                                         current->sslcert = cm_strdup(r[1]);
                                                 }
+                                        } else if(cm_strcaseequ(r[0], "DocumentRoot")) {
+                                                if(r[1] == NULL) {
+                                                        cm_log("Config", "Missing path at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        if(current->root != NULL) free(current->root);
+                                                        current->root = cm_strdup(r[1]);
+                                                }
                                         } else if(cm_strcaseequ(r[0], "ServerRoot")) {
                                                 if(r[1] == NULL) {

trunk/Server/server.c

@@ -216 +216 @@
                 tw_write(ssl, sock, (unsigned char*)doc + incr, size < 128 ? size : 128);
                 incr += 128;
+                if(size <= 128) break;
                 size -= 128;
-                if(size <= 0) break;
         }
 }

trunk/Server/ssl.c

@@ -26 +26 @@
                 SSL_use_certificate_file(ssl, e->sslcert, SSL_FILETYPE_PEM);
                 return 1;
+        } else if(config.root.sslkey != NULL && config.root.sslcert != NULL) {
+                SSL_use_PrivateKey_file(ssl, config.root.sslkey, SSL_FILETYPE_PEM);
+                SSL_use_certificate_file(ssl, config.root.sslcert, SSL_FILETYPE_PEM);
         } else {
                 return 0;

trunk/Server/tw_config.h

@@ -15 +15 @@
         char* sslkey;
         char* sslcert;
+        char* root;
 };
 

trunk/example.conf

@@ -10 +10 @@
 SSLCertificate cert.pem
 
+DocumentRoot /var/www
+
 BeginVirtualHost nishinbsd-ssd
 EndVirtualHost