Changeset 13 in Main for trunk

Timestamp:

Sep 13, 2024, 10:38:57 PM (2 months ago)

Author:

Nishi

Message:

better

Location:

trunk

Files:

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

trunk/Server/config.c

@@ -17 +17 @@
         int i;
         for(i = 0; i < config.vhost_count; i++) {
-                if(strcmp(config.vhosts[i].name, name) == 0 && config.vhosts[i].port == port) {
+                if(strcmp(config.vhosts[i].name, name) == 0 && (config.vhosts[i].port == -1 ? 1 : config.vhosts[i].port == port)) {
                         return &config.vhosts[i];
                 }
@@ -79 +79 @@
                                                                 int i;
                                                                 current->name = cm_strdup(vhost);
-                                                                current->port = 80;
+                                                                current->port = -1;
                                                                 for(i = 0; vhost[i] != 0; i++) {
                                                                         if(vhost[i] == ':') {

trunk/Server/server.c

@@ -128 +128 @@
 void tw_server_pass(int sock, bool ssl, int port) {
 #endif
+        char* name = config.hostname;
+
         SSL_CTX* ctx = NULL;
         SSL* s = NULL;

trunk/example.conf

@@ -8 +8 @@
 SSLCertificate cert.pem
 
-BeginVirtualHost nishinbsd-ssd:8443
+BeginVirtualHost nishinbsd-ssd
 EndVirtualHost