1 files changed, 192 insertions, 184 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index b52526a78..2b0acd7dc 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -95,9 +95,7 @@
  * If -c is not set, an attempt will be made to open the default
  * root configuration file.  If -c is set and the file is not found, the
  * server exits with an error.
- *
  */
- /* TODO: use TCP_CORK, parse_config() */
 //config:config HTTPD
 //config:       bool "httpd (32 kb)"
 //config:       default y
@@ -246,6 +244,8 @@
 //usage:     "\n        -e STRING       HTML encode STRING"
 //usage:     "\n        -d STRING       URL decode STRING"
 
+/* TODO: use TCP_CORK, parse_config() */
+
 #include "libbb.h"
 #include "common_bufsiz.h"
 #if ENABLE_PAM
@@ -267,6 +267,7 @@
 #define DEBUG 0
 
 #define IOBUF_SIZE 8192
+#define MAX_HTTP_HEADERS_SIZE ((8*1024) - 16)
 #if PIPE_BUF >= IOBUF_SIZE
 # error "PIPE_BUF >= IOBUF_SIZE"
 #endif
@@ -305,6 +306,13 @@ typedef struct Htaccess_Proxy {
         char *url_to;
 } Htaccess_Proxy;
 
+typedef enum CGI_type {
+        CGI_NONE = 0,
+        CGI_NORMAL,
+        CGI_INDEX,
+        CGI_INTERPRETER,
+} CGI_type;
+
 enum {
         HTTP_OK = 200,
         HTTP_PARTIAL_CONTENT = 206,
@@ -316,6 +324,7 @@ enum {
         HTTP_REQUEST_TIMEOUT = 408,
         HTTP_NOT_IMPLEMENTED = 501,   /* used for unrecognized requests */
         HTTP_INTERNAL_SERVER_ERROR = 500,
+        HTTP_ENTITY_TOO_LARGE = 413,
         HTTP_CONTINUE = 100,
 #if 0   /* future use */
         HTTP_SWITCHING_PROTOCOLS = 101,
@@ -347,6 +356,7 @@ static const uint16_t http_response_type[] ALIGN2 = {
         HTTP_BAD_REQUEST,
         HTTP_FORBIDDEN,
         HTTP_INTERNAL_SERVER_ERROR,
+        HTTP_ENTITY_TOO_LARGE,
 #if 0   /* not implemented */
         HTTP_CREATED,
         HTTP_ACCEPTED,
@@ -377,6 +387,7 @@ static const struct {
         { "Bad Request", "Unsupported method" },
         { "Forbidden", ""  },
         { "Internal Server Error", "Internal Server Error" },
+        { "Entity Too Large", "Entity Too Large" },
 #if 0   /* not implemented */
         { "Created" },
         { "Accepted" },
@@ -396,12 +407,11 @@ struct globals {
         /* client can handle gzip / we are going to send gzip */
         smallint content_gzip;
 #endif
-        unsigned rmt_ip;        /* used for IP-based allow/deny rules */
         time_t last_mod;
         char *rmt_ip_str;       /* for $REMOTE_ADDR and $REMOTE_PORT */
         const char *bind_addr_or_port;
 
-        const char *g_query;
+        char *g_query;
         const char *opt_c_configFile;
         const char *home_httpd;
         const char *index_page;
@@ -412,11 +422,6 @@ struct globals {
 
         IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
         IF_FEATURE_HTTPD_BASIC_AUTH(char *remoteuser;)
-        IF_FEATURE_HTTPD_CGI(char *referer;)
-        IF_FEATURE_HTTPD_CGI(char *user_agent;)
-        IF_FEATURE_HTTPD_CGI(char *host;)
-        IF_FEATURE_HTTPD_CGI(char *http_accept;)
-        IF_FEATURE_HTTPD_CGI(char *http_accept_language;)
 
         off_t file_size;        /* -1 - unknown */
 #if ENABLE_FEATURE_HTTPD_RANGES
@@ -452,7 +457,6 @@ struct globals {
 #else
 # define content_gzip     0
 #endif
-#define rmt_ip            (G.rmt_ip           )
 #define bind_addr_or_port (G.bind_addr_or_port)
 #define g_query           (G.g_query          )
 #define opt_c_configFile  (G.opt_c_configFile )
@@ -1194,37 +1198,39 @@ static void send_headers_and_exit(int responseNum)
 }
 
 /*
- * Read from the socket until '\n' or EOF. '\r' chars are removed.
+ * Read from the socket until '\n' or EOF.
+ * '\r' chars are removed.
  * '\n' is replaced with NUL.
  * Return number of characters read or 0 if nothing is read
  * ('\r' and '\n' are not counted).
  * Data is returned in iobuf.
  */
-static int get_line(void)
+static unsigned get_line(void)
 {
-        int count = 0;
+        unsigned count;
         char c;
 
         alarm(HEADER_READ_TIMEOUT);
+        count = 0;
         while (1) {
                 if (hdr_cnt <= 0) {
                         hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof_hdr_buf);
                         if (hdr_cnt <= 0)
-                                break;
+                                goto ret;
                         hdr_ptr = hdr_buf;
                 }
-                iobuf[count] = c = *hdr_ptr++;
                 hdr_cnt--;
-
+                c = *hdr_ptr++;
                 if (c == '\r')
                         continue;
-                if (c == '\n') {
-                        iobuf[count] = '\0';
+                if (c == '\n')
                         break;
-                }
+                iobuf[count] = c;
                 if (count < (IOBUF_SIZE - 1))      /* check overflow */
                         count++;
         }
+ ret:
+        iobuf[count] = '\0';
         return count;
 }
 
@@ -1437,23 +1443,17 @@ static void setenv1(const char *name, const char *value)
  * const char *url              The requested URL (with leading /).
  * const char *orig_uri         The original URI before rewriting (if any)
  * int post_len                 Length of the POST body.
- * const char *cookie           For set HTTP_COOKIE.
- * const char *content_type     For set CONTENT_TYPE.
  */
 static void send_cgi_and_exit(
                 const char *url,
                 const char *orig_uri,
                 const char *request,
-                int post_len,
-                const char *cookie,
-                const char *content_type) NORETURN;
+                int post_len) NORETURN;
 static void send_cgi_and_exit(
                 const char *url,
                 const char *orig_uri,
                 const char *request,
-                int post_len,
-                const char *cookie,
-                const char *content_type)
+                int post_len)
 {
         struct fd_pair fromCgi;  /* CGI -> httpd pipe */
         struct fd_pair toCgi;    /* httpd -> CGI pipe */
@@ -1531,26 +1531,14 @@ static void send_cgi_and_exit(
 #endif
                 }
         }
-        setenv1("HTTP_USER_AGENT", G.user_agent);
-        if (G.http_accept)
-                setenv1("HTTP_ACCEPT", G.http_accept);
-        if (G.http_accept_language)
-                setenv1("HTTP_ACCEPT_LANGUAGE", G.http_accept_language);
         if (post_len)
                 putenv(xasprintf("CONTENT_LENGTH=%u", post_len));
-        if (cookie)
-                setenv1("HTTP_COOKIE", cookie);
-        if (content_type)
-                setenv1("CONTENT_TYPE", content_type);
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
         if (remoteuser) {
                 setenv1("REMOTE_USER", remoteuser);
                 putenv((char*)"AUTH_TYPE=Basic");
         }
 #endif
-        if (G.referer)
-                setenv1("HTTP_REFERER", G.referer);
-        setenv1("HTTP_HOST", G.host); /* set to "" if NULL */
         /* setenv1("SERVER_NAME", safe_gethostname()); - don't do this,
          * just run "env SERVER_NAME=xyz httpd ..." instead */
 
@@ -1817,7 +1805,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
         log_and_exit();
 }
 
-static int checkPermIP(void)
+static void if_ip_denied_send_HTTP_FORBIDDEN_and_exit(unsigned remote_ip)
 {
         Htaccess_IP *cur;
 
@@ -1836,11 +1824,15 @@ static int checkPermIP(void)
                         (unsigned char)(cur->mask)
                 );
 #endif
-                if ((rmt_ip & cur->mask) == cur->ip)
-                        return (cur->allow_deny == 'A'); /* A -> 1 */
+                if ((remote_ip & cur->mask) == cur->ip) {
+                        if (cur->allow_deny == 'A')
+                                return;
+                        send_headers_and_exit(HTTP_FORBIDDEN);
+                }
         }
 
-        return !flg_deny_all; /* depends on whether we saw "D:*" */
+        if (flg_deny_all) /* depends on whether we saw "D:*" */
+                send_headers_and_exit(HTTP_FORBIDDEN);
 }
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
@@ -2077,12 +2069,15 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
         char *urlcopy;
         char *urlp;
         char *tptr;
+        unsigned remote_ip;
+#if ENABLE_FEATURE_HTTPD_CGI
+        unsigned total_headers_len;
+#endif
 #if ENABLE_FEATURE_HTTPD_CGI
         static const char request_HEAD[] ALIGN1 = "HEAD";
         const char *prequest;
-        char *cookie = NULL;
-        char *content_type = NULL;
         unsigned long length = 0;
+        enum CGI_type cgi_type = CGI_NONE;
 #elif ENABLE_FEATURE_HTTPD_PROXY
 #define prequest request_GET
         unsigned long length = 0;
@@ -2090,29 +2085,23 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
         smallint authorized = -1;
 #endif
-        smallint ip_allowed;
         char http_major_version;
-#if ENABLE_FEATURE_HTTPD_PROXY
-        char http_minor_version;
-        char *header_buf = header_buf; /* for gcc */
-        char *header_ptr = header_ptr;
-        Htaccess_Proxy *proxy_entry;
-#endif
+        char *HTTP_slash;
 
         /* Allocation of iobuf is postponed until now
          * (IOW, server process doesn't need to waste 8k) */
         iobuf = xmalloc(IOBUF_SIZE);
 
-        rmt_ip = 0;
+        remote_ip = 0;
         if (fromAddr->u.sa.sa_family == AF_INET) {
-                rmt_ip = ntohl(fromAddr->u.sin.sin_addr.s_addr);
+                remote_ip = ntohl(fromAddr->u.sin.sin_addr.s_addr);
         }
 #if ENABLE_FEATURE_IPV6
         if (fromAddr->u.sa.sa_family == AF_INET6
          && fromAddr->u.sin6.sin6_addr.s6_addr32[0] == 0
          && fromAddr->u.sin6.sin6_addr.s6_addr32[1] == 0
          && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[2]) == 0xffff)
-                rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]);
+                remote_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]);
 #endif
         if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) {
                 /* NB: can be NULL (user runs httpd -i by hand?) */
@@ -2125,6 +2114,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                 if (verbose > 2)
                         bb_error_msg("connected");
         }
+        if_ip_denied_send_HTTP_FORBIDDEN_and_exit(remote_ip);
 
         /* Install timeout handler. get_line() needs it. */
         signal(SIGALRM, send_REQUEST_TIMEOUT_and_exit);
@@ -2159,30 +2149,58 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                 send_headers_and_exit(HTTP_BAD_REQUEST);
 
         /* Find end of URL and parse HTTP version, if any */
-        http_major_version = '0';
-        IF_FEATURE_HTTPD_PROXY(http_minor_version = '0';)
-        tptr = strchrnul(urlp, ' ');
+//TODO: maybe just reject all queries which have no " HTTP/xyz" suffix?
+//Then 'http_major_version' can be deleted
+        http_major_version = ('0' - 1); /* "less than 0th" version */
+        HTTP_slash = strchrnul(urlp, ' ');
         /* Is it " HTTP/"? */
-        if (tptr[0] && strncmp(tptr + 1, HTTP_200, 5) == 0) {
-                http_major_version = tptr[6];
-                IF_FEATURE_HTTPD_PROXY(http_minor_version = tptr[8];)
+        if (HTTP_slash[0] && strncmp(HTTP_slash + 1, HTTP_200, 5) == 0) {
+                http_major_version = HTTP_slash[6];
+                *HTTP_slash++ = '\0';
         }
-        *tptr = '\0';
 
         /* Copy URL from after "GET "/"POST " to stack-allocated char[] */
-        urlcopy = alloca((tptr - urlp) + 2 + strlen(index_page));
+        urlcopy = alloca((HTTP_slash - urlp) + 2 + strlen(index_page));
         /*if (urlcopy == NULL)
          *      send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);*/
         strcpy(urlcopy, urlp);
         /* NB: urlcopy ptr is never changed after this */
 
-        /* Extract url args if present */
-        /* g_query = NULL; - already is */
-        tptr = strchr(urlcopy, '?');
-        if (tptr) {
-                *tptr++ = '\0';
-                g_query = tptr;
+#if ENABLE_FEATURE_HTTPD_PROXY
+        {
+                int proxy_fd;
+                len_and_sockaddr *lsa;
+                Htaccess_Proxy *proxy_entry = find_proxy_entry(urlcopy);
+
+                if (proxy_entry) {
+                        lsa = host2sockaddr(proxy_entry->host_port, 80);
+                        if (!lsa)
+                                send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
+                        proxy_fd = socket(lsa->u.sa.sa_family, SOCK_STREAM, 0);
+                        if (proxy_fd < 0)
+                                send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
+                        if (connect(proxy_fd, &lsa->u.sa, lsa->len) < 0)
+                                send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
+                        /* Config directive was of the form:
+                         *   P:/url:[http://]hostname[:port]/new/path
+                         * When /urlSFX is requested, reverse proxy it
+                         * to http://hostname[:port]/new/pathSFX
+                         */
+                        fdprintf(proxy_fd, "%s %s%s %s\r\n",
+                                        prequest, /* "GET" or "POST" */
+                                        proxy_entry->url_to, /* "/new/path" */
+                                        urlcopy + strlen(proxy_entry->url_from), /* "SFX" */
+                                        HTTP_slash /* HTTP/xyz" or "" */
+                        );
+                        cgi_io_loop_and_exit(proxy_fd, proxy_fd, /*max POST length:*/ INT_MAX);
+                }
         }
+#endif
+
+        /* Extract url args if present */
+        g_query = strchr(urlcopy, '?');
+        if (g_query)
+                *g_query++ = '\0';
 
         /* Decode URL escape sequences */
         tptr = percent_decode_in_place(urlcopy, /*strict:*/ 1);
@@ -2222,7 +2240,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                         }
                 }
                 *++urlp = *tptr;
-                if (*urlp == '\0')
+                if (*tptr == '\0')
                         break;
  next_char:
                 tptr++;
@@ -2240,47 +2258,87 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                 bb_error_msg("url:%s", urlcopy);
 
         tptr = urlcopy;
-        ip_allowed = checkPermIP();
-        while (ip_allowed && (tptr = strchr(tptr + 1, '/')) != NULL) {
+        while ((tptr = strchr(tptr + 1, '/')) != NULL) {
                 /* have path1/path2 */
                 *tptr = '\0';
                 if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) {
                         /* may have subdir config */
                         parse_conf(urlcopy + 1, SUBDIR_PARSE);
-                        ip_allowed = checkPermIP();
+                        if_ip_denied_send_HTTP_FORBIDDEN_and_exit(remote_ip);
                 }
                 *tptr = '/';
         }
 
-#if ENABLE_FEATURE_HTTPD_PROXY
-        proxy_entry = find_proxy_entry(urlcopy);
-        if (proxy_entry)
-                header_buf = header_ptr = xmalloc(IOBUF_SIZE);
+        tptr = urlcopy + 1;      /* skip first '/' */
+
+#if ENABLE_FEATURE_HTTPD_CGI
+        if (is_prefixed_with(tptr, "cgi-bin/")) {
+                if (tptr[8] == '\0') {
+                        /* protect listing "cgi-bin/" */
+                        send_headers_and_exit(HTTP_FORBIDDEN);
+                }
+                cgi_type = CGI_NORMAL;
+        }
+#endif
+
+        if (urlp[-1] == '/') {
+                /* When index_page string is appended to <dir>/ URL, it overwrites
+                 * the query string. If we fall back to call /cgi-bin/index.cgi,
+                 * query string would be lost and not available to the CGI.
+                 * Work around it by making a deep copy.
+                 */
+                if (ENABLE_FEATURE_HTTPD_CGI)
+                        g_query = xstrdup(g_query); /* ok for NULL too */
+                strcpy(urlp, index_page);
+        }
+        if (stat(tptr, &sb) == 0) {
+#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
+                char *suffix = strrchr(tptr, '.');
+                if (suffix) {
+                        Htaccess *cur;
+                        for (cur = script_i; cur; cur = cur->next) {
+                                if (strcmp(cur->before_colon + 1, suffix) == 0) {
+                                        cgi_type = CGI_INTERPRETER;
+                                        break;
+                                }
+                        }
+                }
+#endif
+                if (!found_moved_temporarily) {
+                        file_size = sb.st_size;
+                        last_mod = sb.st_mtime;
+                }
+        }
+#if ENABLE_FEATURE_HTTPD_CGI
+        else if (urlp[-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) {
+                        cgi_type = CGI_INDEX;
+                }
+        }
 #endif
+        urlp[0] = '\0';
 
+#if ENABLE_FEATURE_HTTPD_CGI
+        total_headers_len = 0;
+#endif
         if (http_major_version >= '0') {
                 /* Request was with "... HTTP/nXXX", and n >= 0 */
 
                 /* Read until blank line */
                 while (1) {
-                        if (!get_line())
+                        unsigned iobuf_len = get_line();
+                        if (!iobuf_len)
                                 break; /* EOF or error or empty line */
+#if ENABLE_FEATURE_HTTPD_CGI
+                        /* Prevent unlimited growth of HTTP_xyz envvars */
+                        total_headers_len += iobuf_len;
+                        if (total_headers_len >= MAX_HTTP_HEADERS_SIZE)
+                                send_headers_and_exit(HTTP_ENTITY_TOO_LARGE);
+#endif
                         if (DEBUG)
                                 bb_error_msg("header: '%s'", iobuf);
-
-#if ENABLE_FEATURE_HTTPD_PROXY
-                        /* We need 2 more bytes for yet another "\r\n" -
-                         * see near fdprintf(proxy_fd...) further below */
-                        if (proxy_entry && (header_ptr - header_buf) < IOBUF_SIZE - 4) {
-                                int len = strnlen(iobuf, IOBUF_SIZE - (header_ptr - header_buf) - 4);
-                                memcpy(header_ptr, iobuf, len);
-                                header_ptr += len;
-                                header_ptr[0] = '\r';
-                                header_ptr[1] = '\n';
-                                header_ptr += 2;
-                        }
-#endif
-
 #if ENABLE_FEATURE_HTTPD_CGI || ENABLE_FEATURE_HTTPD_PROXY
                         /* Try and do our best to parse more lines */
                         if ((STRNCASECMP(iobuf, "Content-Length:") == 0)) {
@@ -2299,30 +2357,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                                         if (errno || length > INT_MAX)
                                                 send_headers_and_exit(HTTP_BAD_REQUEST);
                                 }
-                        }
-#endif
-#if ENABLE_FEATURE_HTTPD_CGI
-                        else if (STRNCASECMP(iobuf, "Cookie:") == 0) {
-                                if (!cookie) /* in case they send millions of these, do not OOM */
-                                        cookie = xstrdup(skip_whitespace(iobuf + sizeof("Cookie:")-1));
-                        } else if (STRNCASECMP(iobuf, "Content-Type:") == 0) {
-                                if (!content_type)
-                                        content_type = xstrdup(skip_whitespace(iobuf + sizeof("Content-Type:")-1));
-                        } else if (STRNCASECMP(iobuf, "Referer:") == 0) {
-                                if (!G.referer)
-                                        G.referer = xstrdup(skip_whitespace(iobuf + sizeof("Referer:")-1));
-                        } else if (STRNCASECMP(iobuf, "User-Agent:") == 0) {
-                                if (!G.user_agent)
-                                        G.user_agent = xstrdup(skip_whitespace(iobuf + sizeof("User-Agent:")-1));
-                        } else if (STRNCASECMP(iobuf, "Host:") == 0) {
-                                if (!G.host)
-                                        G.host = xstrdup(skip_whitespace(iobuf + sizeof("Host:")-1));
-                        } else if (STRNCASECMP(iobuf, "Accept:") == 0) {
-                                if (!G.http_accept)
-                                        G.http_accept = xstrdup(skip_whitespace(iobuf + sizeof("Accept:")-1));
-                        } else if (STRNCASECMP(iobuf, "Accept-Language:") == 0) {
-                                if (!G.http_accept_language)
-                                        G.http_accept_language = xstrdup(skip_whitespace(iobuf + sizeof("Accept-Language:")-1));
+                                continue;
                         }
 #endif
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
@@ -2338,6 +2373,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                                 /* decodeBase64() skips whitespace itself */
                                 decodeBase64(tptr);
                                 authorized = check_user_passwd(urlcopy, tptr);
+                                continue;
                         }
 #endif
 #if ENABLE_FEATURE_HTTPD_RANGES
@@ -2355,6 +2391,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                                                         range_start = -1;
                                         }
                                 }
+                                continue;
                         }
 #endif
 #if ENABLE_FEATURE_HTTPD_GZIP
@@ -2372,6 +2409,35 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                                                 content_gzip = 1;
                                         //}
                                 }
+                                continue;
+                        }
+#endif
+#if ENABLE_FEATURE_HTTPD_CGI
+                        if (cgi_type != CGI_NONE) {
+                                bool ct = (STRNCASECMP(iobuf, "Content-Type:") == 0);
+                                char *cp;
+                                char *colon = strchr(iobuf, ':');
+
+                                if (!colon)
+                                        continue;
+                                cp = iobuf;
+                                while (cp < colon) {
+                                        /* a-z => A-Z, not-alnum => _ */
+                                        char c = (*cp & ~0x20); /* toupper for A-Za-z, undef for others */
+                                        if ((unsigned)(c - 'A') <= ('Z' - 'A')) {
+                                                *cp++ = c;
+                                                continue;
+                                        }
+                                        if (!isdigit(*cp))
+                                                *cp = '_';
+                                        cp++;
+                                }
+                                /* "Content-Type:" gets no HTTP_ prefix, all others do */
+                                cp = xasprintf(ct ? "HTTP_%.*s=%s" + 5 : "HTTP_%.*s=%s",
+                                        (int)(colon - iobuf), iobuf,
+                                        skip_whitespace(colon + 1)
+                                );
+                                putenv(cp);
                         }
 #endif
                 } /* while extra header reading */
@@ -2380,7 +2446,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
         /* We are done reading headers, disable peer timeout */
         alarm(0);
 
-        if (strcmp(bb_basename(urlcopy), HTTPD_CONF) == 0 || !ip_allowed) {
+        if (strcmp(bb_basename(urlcopy), HTTPD_CONF) == 0) {
                 /* protect listing [/path]/httpd.conf or IP deny */
                 send_headers_and_exit(HTTP_FORBIDDEN);
         }
@@ -2398,83 +2464,23 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                 send_headers_and_exit(HTTP_MOVED_TEMPORARILY);
         }
 
-#if ENABLE_FEATURE_HTTPD_PROXY
-        if (proxy_entry != NULL) {
-                int proxy_fd;
-                len_and_sockaddr *lsa;
-
-                lsa = host2sockaddr(proxy_entry->host_port, 80);
-                if (lsa == NULL)
-                        send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
-                proxy_fd = socket(lsa->u.sa.sa_family, SOCK_STREAM, 0);
-                if (proxy_fd < 0)
-                        send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
-                if (connect(proxy_fd, &lsa->u.sa, lsa->len) < 0)
-                        send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
-                fdprintf(proxy_fd, "%s %s%s%s%s HTTP/%c.%c\r\n",
-                                prequest, /* GET or POST */
-                                proxy_entry->url_to, /* url part 1 */
-                                urlcopy + strlen(proxy_entry->url_from), /* url part 2 */
-                                (g_query ? "?" : ""), /* "?" (maybe) */
-                                (g_query ? g_query : ""), /* query string (maybe) */
-                                http_major_version, http_minor_version);
-                header_ptr[0] = '\r';
-                header_ptr[1] = '\n';
-                header_ptr += 2;
-                write(proxy_fd, header_buf, header_ptr - header_buf);
-                free(header_buf); /* on the order of 8k, free it */
-                cgi_io_loop_and_exit(proxy_fd, proxy_fd, length);
-        }
-#endif
-
         tptr = urlcopy + 1;      /* skip first '/' */
 
 #if ENABLE_FEATURE_HTTPD_CGI
-        if (is_prefixed_with(tptr, "cgi-bin/")) {
-                if (tptr[8] == '\0') {
-                        /* protect listing "cgi-bin/" */
-                        send_headers_and_exit(HTTP_FORBIDDEN);
-                }
-                send_cgi_and_exit(urlcopy, urlcopy, prequest, length, cookie, content_type);
+        if (cgi_type != CGI_NONE) {
+                send_cgi_and_exit(
+                        (cgi_type == CGI_INDEX) ? "/cgi-bin/index.cgi"
+                        /*CGI_NORMAL or CGI_INTERPRETER*/ : urlcopy,
+                        urlcopy, prequest, length
+                );
         }
 #endif
 
         if (urlp[-1] == '/') {
-                /* When index_page string is appended to <dir>/ URL, it overwrites
-                 * the query string. If we fall back to call /cgi-bin/index.cgi,
-                 * query string would be lost and not available to the CGI.
-                 * Work around it by making a deep copy.
-                 */
-                if (ENABLE_FEATURE_HTTPD_CGI)
-                        g_query = xstrdup(g_query); /* ok for NULL too */
                 strcpy(urlp, index_page);
         }
-        if (stat(tptr, &sb) == 0) {
-#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-                char *suffix = strrchr(tptr, '.');
-                if (suffix) {
-                        Htaccess *cur;
-                        for (cur = script_i; cur; cur = cur->next) {
-                                if (strcmp(cur->before_colon + 1, suffix) == 0) {
-                                        send_cgi_and_exit(urlcopy, urlcopy, prequest, length, cookie, content_type);
-                                }
-                        }
-                }
-#endif
-                file_size = sb.st_size;
-                last_mod = sb.st_mtime;
-        }
-#if ENABLE_FEATURE_HTTPD_CGI
-        else if (urlp[-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) {
-                        urlp[0] = '\0'; /* remove index_page */
-                        send_cgi_and_exit("/cgi-bin/index.cgi", urlcopy, prequest, length, cookie, content_type);
-                }
-        }
-        /* else fall through to send_file, it errors out if open fails: */
 
+#if ENABLE_FEATURE_HTTPD_CGI
         if (prequest != request_GET && prequest != request_HEAD) {
                 /* POST for files does not make sense */
                 send_headers_and_exit(HTTP_NOT_IMPLEMENTED);
@@ -2593,7 +2599,9 @@ static void mini_httpd_inetd(void)
 
 static void sighup_handler(int sig UNUSED_PARAM)
 {
+        int sv = errno;
         parse_conf(DEFAULT_PATH_HTTPD_CONF, SIGNALED_PARSE);
+        errno = sv;
 }
 
 enum {