Changeset 156 for uKadecot

Timestamp:

Feb 5, 2016, 9:06:37 AM (8 years ago)

Author:

coas-nagasima

Message:

クエリー式もリダイレクトアドレスに含めるよう修正

Location:

uKadecot/trunk

Files:

• csp/flash/ukadecot_20160202214828.mot (deleted)
• csp/flash/ukadecot_20160205090209.mot (added)
• uip/apps/webserver/httpd.c (modified) (4 diffs)
• uip/apps/webserver/httpd.h (modified) (1 diff)

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

@@ -107 +107 @@
         char headers[MAX(sizeof(http_header_404), sizeof(http_header_200))
                 + sizeof(http_content_encoding_gzip)
+                + sizeof(http_location) + sizeof(((struct httpd_state *)0)->filename) + 2
                 + sizeof(union temp_type_t)
         ];
@@ -212 +213 @@
     len = strlen(s->filename);
     memcpy(pos, s->filename, len); pos += len;
+    if (s->query != NULL) {
+      pos[0] = '?'; pos++;
+      len = strlen(s->query);
+      memcpy(pos, s->query, len); pos += len;
+    }
     len = 2;
     memcpy(pos, "\r\n", len); pos += len;
   }
 
-  ptr = strrchr(s->message.request_url, ISO_period);
+  ptr = strrchr(s->filename, ISO_period);
   if (ptr == NULL) {
     len = strlen(http_content_type_binary);
@@ -418 +424 @@
   }
 
+  ptr = strrchr(s->message.request_url, '?');
+  if (ptr != NULL){
+    ptr[0] = '\0';
+    s->query = &ptr[1];
+  }
+  else
+    s->query = NULL;
+
   /* ""か"/"なら"index.html"に変更 */
   if ((s->message.request_url[0] == '\0') || ((s->message.request_url[0] == '/') && (s->message.request_url[1] == '\0'))) {
     s->drv = 0;
     strcpy_s(s->filename, sizeof(s->filename), http_index_html);
+    s->file.redirect = 1;
   }
   /* "/~/"ならSDカードから読み込み */
@@ -432 +447 @@
     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);*/

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

@@ -60 +60 @@
       char filename[256];
       int len;
+      char *query;
       struct httpd_fs_file file;
     };