#if HAVE_AFINET6 -> #ifdef HAVE_AFINET6

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

diff --git a/networking/httpd.c b/networking/httpd.c
index 47d41a1e2adf596e28d7f4a744ed5e7d4d911d1d..b82e9f9951cf9010e52e925c8bca676d30612d96 100644 (file)
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -24,6 +24,9 @@
  * server changes directory to the location of the script and executes it
  * after setting QUERY_STRING and other environment variables.
  *
+ * Doc:
+ * "CGI Environment Variables": http://hoohoo.ncsa.uiuc.edu/cgi/env.html
+ *
  * The server can also be invoked as a url arg decoder and html text encoder
  * as follows:
  *  foo=`httpd -d $foo`           # decode "Hello%20World" as "Hello World"
@@ -1036,6 +1039,13 @@ 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);
+               /* http://hoohoo.ncsa.uiuc.edu/cgi/env.html:
+                * QUERY_STRING: The information which follows the ? in the URL
+                * which referenced this script. This is the query information.
+                * It should not be decoded in any fashion. This variable
+                * should always be set when there is query information,
+                * regardless of command line decoding. */
+               /* (Older versions of bbox seemed to do some decoding) */
                setenv1("QUERY_STRING", config->query);
                setenv1("SERVER_SOFTWARE", httpdVersion);
                putenv("SERVER_PROTOCOL=HTTP/1.0");
@@ -1103,7 +1113,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]);
@@ -1190,6 +1200,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);
                                        }
@@ -1480,6 +1494,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;
@@ -1640,20 +1655,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);
@@ -1745,22 +1766,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;
 }