Make sure stdlib.h is always included before dmalloc.h to avoid problems

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

diff --git a/networking/httpd.c b/networking/httpd.c
index 1a3f5f94f3a26d96b1c3ce7b75903f47695c5fe0..9b36101d799cabb71567d6cad4b46a2a6f3ab629 100644 (file)
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1148,10 +1148,12 @@ static int sendCgi(const char *url,
        addEnv("HTTP", "COOKIE", cookie);
       if(content_type)
        addEnv("CONTENT", "TYPE", content_type);
+#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
       if(config->remoteuser) {
        addEnv("REMOTE", "USER", config->remoteuser);
        addEnv("AUTH_TYPE", "", "Basic");
       }
+#endif
       if(config->referer)
        addEnv("HTTP", "REFERER", config->referer);
 
@@ -1269,7 +1271,9 @@ static int sendCgi(const char *url,
            }
            firstLine = 0;
          }
-         bb_full_write(s, rbuf, count);
+         if (bb_full_write(s, rbuf, count) != count)
+             break;
+
 #ifdef DEBUG
          if (config->debugHttpd)
                fprintf(stderr, "cgi read %d bytes\n", count);
@@ -1707,8 +1711,10 @@ FORBIDDEN:      /* protect listing /cgi-bin */
 # ifdef CONFIG_FEATURE_HTTPD_CGI
   free(cookie);
   free(content_type);
-  free(config->remoteuser);
   free(config->referer);
+#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
+  free(config->remoteuser);
+#endif
 # endif
   shutdown(a_c_w, SHUT_WR);
   shutdown(a_c_r, SHUT_RD);