Changeset 32 in Main for trunk/Server/server.c

Timestamp:

Sep 16, 2024, 9:42:19 PM (2 months ago)

Author:

Nishi

Message:

can handle cache headers.

File:

• trunk/Server/server.c (modified) (12 diffs)

trunk/Server/server.c

@@ -16 +16 @@
 #include <stdarg.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #include <cm_string.h>
@@ -24 +25 @@
 #include <winsock2.h>
 #include <process.h>
+
+#include "strptime.h"
 #else
 #include <sys/select.h>
@@ -170 +173 @@
             "</html>\n"
 
-void _tw_process_page(SSL* ssl, int sock, const char* status, const char* type, FILE* f, const unsigned char* doc, size_t size, char** headers) {
+void _tw_process_page(SSL* ssl, int sock, const char* status, const char* type, FILE* f, const unsigned char* doc, size_t size, char** headers, time_t mtime, time_t cmtime) {
         char construct[512];
+        if(mtime != 0 && cmtime != 0 && mtime <= cmtime) {
+                status = "304 Not Modified";
+                type = NULL;
+                size = 0;
+                headers = NULL;
+                f = NULL;
+                doc = NULL;
+        }
         sprintf(construct, "%llu", (unsigned long long)size);
         tw_write(ssl, sock, "HTTP/1.1 ", 9);
@@ -188 +199 @@
                 tw_write(ssl, sock, construct, strlen(construct));
                 tw_write(ssl, sock, "\r\n", 2);
+                if(mtime != 0) {
+                        struct tm* tm = gmtime(&mtime);
+                        char date[513];
+                        strftime(date, 512, "%a, %d %b %Y %H:%M:%S GMT", tm);
+                        tw_write(ssl, sock, "Last-Modified: ", 5 + 8 + 2);
+                        tw_write(ssl, sock, date, strlen(date));
+                        tw_write(ssl, sock, "\r\n", 2);
+                }
         }
         int i;
@@ -215 +234 @@
 }
 
-void tw_process_page(SSL* ssl, int sock, const char* status, const char* type, FILE* f, const unsigned char* doc, size_t size) { _tw_process_page(ssl, sock, status, type, f, doc, size, NULL); }
+void tw_process_page(SSL* ssl, int sock, const char* status, const char* type, FILE* f, const unsigned char* doc, size_t size, time_t mtime, time_t cmtime) { _tw_process_page(ssl, sock, status, type, f, doc, size, NULL, mtime, cmtime); }
 
 const char* tw_http_status(int code) {
@@ -258 +277 @@
 void tw_http_error(SSL* ssl, int sock, int error, char* name, int port) {
         char* str = tw_http_default_error(error, name, port);
-        tw_process_page(ssl, sock, tw_http_status(error), "text/html", NULL, str, strlen(str));
+        tw_process_page(ssl, sock, tw_http_status(error), "text/html", NULL, str, strlen(str), 0, 0);
         free(str);
 }
@@ -389 +408 @@
                 char* vhost = cm_strdup(config.hostname);
                 int i;
+                time_t cmtime = 0;
                 for(i = 0; req.headers[i] != NULL; i += 2) {
                         if(cm_strcaseequ(req.headers[i], "Host")) {
                                 free(vhost);
-                                vhost = req.headers[i + 1];
-                                break;
+                                vhost = cm_strdup(req.headers[i + 1]);
+                        } else if(cm_strcaseequ(req.headers[i], "If-Modified-Since")) {
+                                struct tm tm;
+                                strptime(req.headers[i + 1], "%a, %d %b %Y %H:%M:%S GMT", &tm);
+#ifdef __MINGW32__
+                                cmtime = _mkgmtime(&tm);
+#else
+                                cmtime = timegm(&tm);
+#endif
                         }
                 }
@@ -435 +462 @@
                                         if(req.path[strlen(req.path) - 1] != '/') {
                                                 char* headers[3] = {"Location", cm_strcat(req.path, "/"), NULL};
-                                                _tw_process_page(s, sock, tw_http_status(308), NULL, NULL, NULL, 0, headers);
+                                                _tw_process_page(s, sock, tw_http_status(308), NULL, NULL, NULL, 0, headers, 0, 0);
                                                 free(headers[1]);
                                         } else {
@@ -458 +485 @@
                                                                 stat(p, &st);
                                                                 char* mime = tw_get_mime(ext, vhost_entry);
-                                                                tw_process_page(s, sock, tw_http_status(200), mime, f, NULL, st.st_size);
+                                                                tw_process_page(s, sock, tw_http_status(200), mime, f, NULL, st.st_size, 0, 0);
                                                                 fclose(f);
                                                                 free(p);
@@ -572 +599 @@
                                                         addstring(&str, "       </body>\n");
                                                         addstring(&str, "</html>\n");
-                                                        tw_process_page(s, sock, tw_http_status(200), "text/html", NULL, str, strlen(str));
+                                                        tw_process_page(s, sock, tw_http_status(200), "text/html", NULL, str, strlen(str), 0, 0);
                                                         free(str);
                                                 }
@@ -589 +616 @@
                                         if(ext != NULL) free(ext);
                                         FILE* f = fopen(path, "rb");
-                                        tw_process_page(s, sock, tw_http_status(200), mime, f, NULL, st.st_size);
+                                        tw_process_page(s, sock, tw_http_status(200), mime, f, NULL, st.st_size, st.st_mtime, cmtime);
                                         fclose(f);
                                 }
@@ -599 +626 @@
                 free(vhost);
                 free(host);
+                tw_free_request(&req);
         } else if(ret == -1) {
         } else {