Changeset 155 for uKadecot/trunk/uip/apps/webserver/httpd.c

Timestamp:

Feb 4, 2016, 11:11:09 PM (8 years ago)

Author:

coas-nagasima

Message:

URLがフォルダを指している場合、/index.htmlにリダイレクトするよう変更。

File:

• uKadecot/trunk/uip/apps/webserver/httpd.c (modified) (6 diffs)

uKadecot/trunk/uip/apps/webserver/httpd.c

@@ -203 +203 @@
   }
 
+  if (s->file.redirect) {
+    len = strlen(http_location);
+    memcpy(pos, http_location, len); pos += len;
+    if (s->drv == 1) {
+      len = 2;
+      memcpy(pos, "/~", len); pos += len;
+    }
+    len = strlen(s->filename);
+    memcpy(pos, s->filename, len); pos += len;
+    len = 2;
+    memcpy(pos, "\r\n", len); pos += len;
+  }
+
   ptr = strrchr(s->message.request_url, ISO_period);
   if (ptr == NULL) {
@@ -248 +261 @@
   PT_BEGIN(&s->outputpt);
 
-  s->file.fs = ((char *)&s[1]) - 64 - 512;
-
-  if (!httpd_fs_open(s->drv, s->filename, &s->file)) {
+  if (!httpd_fs_open(s->drv, s->filename, sizeof(s->filename), &s->file)) {
     s->drv = 0;
-    httpd_fs_open(s->drv, http_404_html, &s->file);
-    strcpy_s(s->message.request_url, sizeof(s->message.request_url), http_404_html);
+    strcpy_s(s->filename, sizeof(s->filename), http_404_html);
+    httpd_fs_open(s->drv, s->filename, sizeof(s->filename), &s->file);
     PT_WAIT_THREAD(&s->outputpt,
       send_headers(s,
@@ -261 +272 @@
     PT_WAIT_THREAD(&s->outputpt,
       send_headers(s,
-      http_header_200));
+      s->file.redirect ? http_header_301 : http_header_200));
     PT_WAIT_THREAD(&s->outputpt, send_file(s));
   }
@@ -381 +392 @@
   size_t done;
   const char *data;
+  char *ptr;
+
   PSOCK_BEGIN(&s->sin);
 
@@ -407 +420 @@
   /* ""か"/"なら"index.html"に変更 */
   if ((s->message.request_url[0] == '\0') || ((s->message.request_url[0] == '/') && (s->message.request_url[1] == '\0'))) {
-    strncpy_s(s->message.request_url, sizeof(s->message.request_url), http_index_html, sizeof(s->message.request_url));
-    s->filename = s->message.request_url;
+    s->drv = 0;
+    strcpy_s(s->filename, sizeof(s->filename), http_index_html);
   }
   /* "/~/"ならSDカードから読み込み */
   else if ((s->message.request_url[0] == '/') && (s->message.request_url[1] == '~') && (s->message.request_url[2] == '/')) {
     s->drv = 1;
-    s->filename = &s->message.request_url[2];
+    strcpy_s(s->filename, sizeof(s->filename), &s->message.request_url[2]);
   }
   else {
     s->drv = 0;
-    s->filename = s->message.request_url;
-  }
+    strcpy_s(s->filename, sizeof(s->filename), s->message.request_url);
+  }
+
+  ptr = strrchr(s->filename, '?');
+  if (ptr != NULL)
+    ptr[0] = '\0';
 
   /*  httpd_log_file(uip_conn->ripaddr, s->message.request_url);*/
@@ -426 +443 @@
     s->state = STATE_WS_OUTPUT;
 
+    s->close_req = 0;
     websocket_init(&s->websocket, uip_getid((struct uip_conn *)((intptr_t)s - offsetof(struct uip_conn, appstate))));
     for (;;) {