wget: add TODO

[oweals/busybox.git] / networking / httpd.c

diff --git a/networking/httpd.c b/networking/httpd.c
index afcd089b0ca864821ca2036a06c1c133748195e7..986703d2d5a34d76c7bee2eadb2c34888e5ac4e9 100644 (file)
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -846,9 +846,11 @@ static int sendHeaders(HttpResponseNum responseNum)
        time_t timer = time(0);
        char timeStr[80];
        int len;
+       enum {
+               numNames = sizeof(httpResponseNames) / sizeof(httpResponseNames[0])
+       };
 
-       for (i = 0;
-               i < (sizeof(httpResponseNames)/sizeof(httpResponseNames[0])); i++) {
+       for (i = 0; i < numNames; i++) {
                if (httpResponseNames[i].type == responseNum) {
                        responseString = httpResponseNames[i].name;
                        infoString = httpResponseNames[i].info;
@@ -1034,6 +1036,9 @@ static int sendCgi(const char *url,
                setenv1("SCRIPT_FILENAME", realpath_buff);
                /* set SCRIPT_NAME as full path: /cgi-bin/dirs/script.cgi */
                setenv1("SCRIPT_NAME", purl);
+               /* TODO: bug 996 says we need to decodeString(config->query)
+                * before placing it into env. Is this true? Add example
+                * in the comment please... */
                setenv1("QUERY_STRING", config->query);
                setenv1("SERVER_SOFTWARE", httpdVersion);
                putenv("SERVER_PROTOCOL=HTTP/1.0");
@@ -1101,7 +1106,7 @@ static int sendCgi(const char *url,
 
        post_readed_size = 0;
        post_readed_idx = 0;
-       inFd  = fromCgi[0];
+       inFd = fromCgi[0];
        outFd = toCgi[1];
        close(fromCgi[1]);
        close(toCgi[0]);
@@ -1177,7 +1182,7 @@ static int sendCgi(const char *url,
 # error "PIPESIZE >= MAX_MEMORY_BUFF"
 #endif
 
-                       // There is something to read
+                       /* There is something to read */
                        count = safe_read(inFd, rbuf, PIPESIZE);
                        if (count == 0)
                                break;  /* closed */
@@ -1188,6 +1193,10 @@ static int sendCgi(const char *url,
                                        if (strncmp(rbuf, "HTTP/1.0 200 OK\r\n", 4) != 0) {
                                                full_write(s, "HTTP/1.0 200 OK\r\n", 17);
                                        }
+                                       /* Sometimes CGI is writing to pipe in small chunks
+                                        * and we don't see Content-type (because the read
+                                        * is too short) and we emit bogus "text/plain"!
+                                        * Is it a bug or CGI *has to* write it in one piece? */
                                        if (strstr(rbuf, "ontent-") == 0) {
                                                full_write(s, "Content-type: text/plain\r\n\r\n", 28);
                                        }
@@ -1197,7 +1206,7 @@ static int sendCgi(const char *url,
                                        break;
 
                                if (DEBUG)
-                                       fprintf(stderr, "cgi read %d bytes\n", count);
+                                       fprintf(stderr, "cgi read %d bytes: '%.*s'\n", count, count, rbuf);
                        }
                }
        }
@@ -1478,6 +1487,7 @@ static void handleIncoming(void)
                strcpy(url, buf);
                /* extract url args if present */
                test = strchr(url, '?');
+               config->query = NULL;
                if (test) {
                        *test++ = '\0';
                        config->query = test;
@@ -1638,20 +1648,26 @@ static void handleIncoming(void)
                        sendHeaders(HTTP_NOT_IMPLEMENTED);
                        break;
                }
-               if (purl[-1] == '/') {
-                       if (access("cgi-bin/index.cgi", X_OK) == 0) {
-                               config->query = url;
-                               sendCgi("/cgi-bin/index.cgi", prequest, length, cookie, content_type);
-                               break;
-                       }
-               }
 #endif  /* FEATURE_HTTPD_CGI */
                if (purl[-1] == '/')
                        strcpy(purl, "index.html");
                if (stat(test, &sb) == 0) {
+                       /* It's a dir URL and there is index.html */
                        config->ContentLength = sb.st_size;
                        config->last_mod = sb.st_mtime;
                }
+#if ENABLE_FEATURE_HTTPD_CGI
+               else if (purl[-1] == '/') {
+                       /* It's a dir URL and there is no index.html
+                        * Try cgi-bin/index.cgi */
+                       if (access("/cgi-bin/index.cgi"+1, X_OK) == 0) {
+                               purl[0] = '\0';
+                               config->query = url;
+                               sendCgi("/cgi-bin/index.cgi", prequest, length, cookie, content_type);
+                               break;
+                       }
+               }
+#endif  /* FEATURE_HTTPD_CGI */
                sendFile(test);
                config->ContentLength = -1;
        } while (0);
@@ -1743,22 +1759,19 @@ static int miniHttpd(int server)
                /* set the KEEPALIVE option to cull dead connections */
                on = 1;
                setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, sizeof(on));
-#if !DEBUG
-               if (fork() == 0)
-#endif
-               {
-                       /* This is the spawned thread */
+
+               if (DEBUG || fork() == 0) {
+                       /* child */
 #if ENABLE_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
                        /* protect reload config, may be confuse checking */
                        signal(SIGHUP, SIG_IGN);
 #endif
                        handleIncoming();
-#if !DEBUG
-                       exit(0);
-#endif
+                       if (!DEBUG)
+                               exit(0);
                }
                close(s);
-       } // while (1)
+       } /* while (1) */
        return 0;
 }
 
@@ -1838,6 +1851,11 @@ int httpd_main(int argc, char *argv[])
        USE_FEATURE_HTTPD_SETUID(struct bb_uidgid_t ugid;)
        USE_FEATURE_HTTPD_AUTH_MD5(const char *pass;)
 
+#if ENABLE_LOCALE_SUPPORT
+       /* Undo busybox.c: we want to speak English in http (dates etc) */
+       setlocale(LC_TIME, "C");
+#endif
+
        config = xzalloc(sizeof(*config));
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
        config->realm = "Web Server Authentication";