Changeset 64 in Main for trunk

Timestamp:

Sep 19, 2024, 5:58:17 AM (2 months ago)

Author:

Nishi

Message:

fix stuff

Location:

trunk/Server

Files:

• http.c (modified) (2 diffs)
• server.c (modified) (1 diff)

trunk/Server/http.c

@@ -33 +33 @@
         if(req->body != NULL) free(req->body);
         if(req->version != NULL) free(req->version);
+
+        req->method = NULL;
+        req->path = NULL;
+        req->query = NULL;
+        req->headers = NULL;
+        req->body = NULL;
+        req->version = NULL;
 }
 
@@ -76 +83 @@
 #endif
                 int len = tw_read(ssl, sock, buffer, 512);
-                if(len <= 0) break;
+                if(len <= 0){
+                        bad = true;
+                        break;
+                }
                 int i;
                 for(i = 0; i < len; i++) {

trunk/Server/server.c

@@ -429 +429 @@
                 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 = 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);
+                if(req.headers != NULL){
+                        for(i = 0; req.headers[i] != NULL; i += 2) {
+                                if(cm_strcaseequ(req.headers[i], "Host")) {
+                                        free(vhost);
+                                        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__
-                                time_t t = 0;
-                                struct tm* btm = localtime(&t);
-                                cmtime = mktime(&tm);
-                                cmtime -= (btm->tm_hour * 60 + btm->tm_min) * 60;
-#else
-                                cmtime = timegm(&tm);
-#endif
+                                        time_t t = 0;
+                                        struct tm* btm = localtime(&t);
+                                        cmtime = mktime(&tm);
+                                        cmtime -= (btm->tm_hour * 60 + btm->tm_min) * 60;
+#else
+                                        cmtime = timegm(&tm);
+#endif
+                                }
                         }
                 }