Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid

[apt.git] / test / interactive-helper / aptwebserver.cc

diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index b7663a76aa421b34c48f2745890548b79c7dce4e..e02caa2b3516df0a248cb482256795b648b9ff6a 100644 (file)
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -1,29 +1,33 @@
 #include <config.h>
 
 #include <config.h>
 

-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/error.h>

 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>

-#include <apt-pkg/init.h>
-
-#include <vector>
-#include <string>
-#include <list>
-#include <sstream>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>

 
 

+#include <dirent.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <pthread.h>
+#include <regex.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>

 #include <sys/socket.h>
 #include <sys/socket.h>

-#include <sys/types.h>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <netinet/in.h>
-#include <unistd.h>
-#include <errno.h>

 #include <time.h>
 #include <time.h>

-#include <stdlib.h>
-#include <dirent.h>
-#include <signal.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <iostream>
+#include <sstream>
+#include <list>
+#include <string>
+#include <vector>

 
 

-char const * const httpcodeToStr(int const httpcode)                   /*{{{*/
+static char const * httpcodeToStr(int const httpcode)          /*{{{*/

 {
    switch (httpcode)
    {
 {
    switch (httpcode)
    {


@@ -77,25 +81,37 @@ char const * const httpcodeToStr(int const httpcode)                        /*{{{*/
    return NULL;
 }
                                                                        /*}}}*/
    return NULL;
 }
                                                                        /*}}}*/

-void addFileHeaders(std::list<std::string> &headers, FileFd &data)     /*{{{*/
+static bool chunkedTransferEncoding(std::list<std::string> const &headers) {
+   if (std::find(headers.begin(), headers.end(), "Transfer-Encoding: chunked") != headers.end())
+      return true;
+   if (_config->FindB("aptwebserver::chunked-transfer-encoding", false) == true)
+      return true;
+   return false;
+}
+static void addFileHeaders(std::list<std::string> &headers, FileFd &data)/*{{{*/

 {
 {

-   std::ostringstream contentlength;
-   contentlength << "Content-Length: " << data.FileSize();
-   headers.push_back(contentlength.str());
-
+   if (chunkedTransferEncoding(headers) == false)
+   {
+      std::ostringstream contentlength;
+      contentlength << "Content-Length: " << data.FileSize();
+      headers.push_back(contentlength.str());
+   }

    std::string lastmodified("Last-Modified: ");
    lastmodified.append(TimeRFC1123(data.ModificationTime()));
    headers.push_back(lastmodified);
 }
                                                                        /*}}}*/
    std::string lastmodified("Last-Modified: ");
    lastmodified.append(TimeRFC1123(data.ModificationTime()));
    headers.push_back(lastmodified);
 }
                                                                        /*}}}*/

-void addDataHeaders(std::list<std::string> &headers, std::string &data)        /*{{{*/
+static void addDataHeaders(std::list<std::string> &headers, std::string &data)/*{{{*/

 {
 {

-   std::ostringstream contentlength;
-   contentlength << "Content-Length: " << data.size();
-   headers.push_back(contentlength.str());
+   if (chunkedTransferEncoding(headers) == false)
+   {
+      std::ostringstream contentlength;
+      contentlength << "Content-Length: " << data.size();
+      headers.push_back(contentlength.str());
+   }

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-bool sendHead(int const client, int const httpcode, std::list<std::string> &headers)/*{{{*/
+static bool sendHead(int const client, int const httpcode, std::list<std::string> &headers)/*{{{*/

 {
    std::string response("HTTP/1.1 ");
    response.append(httpcodeToStr(httpcode));
 {
    std::string response("HTTP/1.1 ");
    response.append(httpcodeToStr(httpcode));


@@ -112,6 +128,9 @@ bool sendHead(int const client, int const httpcode, std::list<std::string> &head
    date.append(TimeRFC1123(time(NULL)));
    headers.push_back(date);
 
    date.append(TimeRFC1123(time(NULL)));
    headers.push_back(date);
 

+   if (chunkedTransferEncoding(headers) == true)
+      headers.push_back("Transfer-Encoding: chunked");
+

    std::clog << ">>> RESPONSE to " << client << " >>>" << std::endl;
    bool Success = true;
    for (std::list<std::string>::const_iterator h = headers.begin();
    std::clog << ">>> RESPONSE to " << client << " >>>" << std::endl;
    bool Success = true;
    for (std::list<std::string>::const_iterator h = headers.begin();


@@ -128,25 +147,55 @@ bool sendHead(int const client, int const httpcode, std::list<std::string> &head
    return Success;
 }
                                                                        /*}}}*/
    return Success;
 }
                                                                        /*}}}*/

-bool sendFile(int const client, FileFd &data)                          /*{{{*/
+static bool sendFile(int const client, std::list<std::string> const &headers, FileFd &data)/*{{{*/

 {
    bool Success = true;
 {
    bool Success = true;

+   bool const chunked = chunkedTransferEncoding(headers);

    char buffer[500];
    unsigned long long actual = 0;
    while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true)
    {
       if (actual == 0)
         break;
    char buffer[500];
    unsigned long long actual = 0;
    while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true)
    {
       if (actual == 0)
         break;

-      Success &= FileFd::Write(client, buffer, actual);
+
+      if (chunked == true)
+      {
+        std::string size;
+        strprintf(size, "%llX\r\n", actual);
+        Success &= FileFd::Write(client, size.c_str(), size.size());
+        Success &= FileFd::Write(client, buffer, actual);
+        Success &= FileFd::Write(client, "\r\n", strlen("\r\n"));
+      }
+      else
+        Success &= FileFd::Write(client, buffer, actual);
+   }
+   if (chunked == true)
+   {
+      char const * const finish = "0\r\n\r\n";
+      Success &= FileFd::Write(client, finish, strlen(finish));

    }
    if (Success == false)
    }
    if (Success == false)

-      std::cerr << "SENDFILE: READ/WRITE ERROR to " << client << std::endl;
+      std::cerr << "SENDFILE:" << (chunked ? " CHUNKED" : "") << " READ/WRITE ERROR to " << client << std::endl;

    return Success;
 }
                                                                        /*}}}*/
    return Success;
 }
                                                                        /*}}}*/

-bool sendData(int const client, std::string const &data)               /*{{{*/
+static bool sendData(int const client, std::list<std::string> const &headers, std::string const &data)/*{{{*/

 {
 {

-   if (FileFd::Write(client, data.c_str(), data.size()) == false)
+   if (chunkedTransferEncoding(headers) == true)
+   {
+      unsigned long long const ullsize = data.length();
+      std::string size;
+      strprintf(size, "%llX\r\n", ullsize);
+      char const * const finish = "\r\n0\r\n\r\n";
+      if (FileFd::Write(client, size.c_str(), size.length()) == false ||
+           FileFd::Write(client, data.c_str(), ullsize) == false ||
+           FileFd::Write(client, finish, strlen(finish)) == false)
+      {
+        std::cerr << "SENDDATA: CHUNK WRITE ERROR to " << client << std::endl;
+        return false;
+      }
+   }
+   else if (FileFd::Write(client, data.c_str(), data.size()) == false)

    {
       std::cerr << "SENDDATA: WRITE ERROR to " << client << std::endl;
       return false;
    {
       std::cerr << "SENDDATA: WRITE ERROR to " << client << std::endl;
       return false;


@@ -154,38 +203,42 @@ bool sendData(int const client, std::string const &data)          /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/
-              bool content, std::string const &error = "")
+static void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/
+              bool const content, std::string const &error, std::list<std::string> &headers)

 {
 {

-   std::list<std::string> headers;

    std::string response("<html><head><title>");
    response.append(httpcodeToStr(httpcode)).append("</title></head>");
    response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1>");
    if (httpcode != 200)
    std::string response("<html><head><title>");
    response.append(httpcodeToStr(httpcode)).append("</title></head>");
    response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1>");
    if (httpcode != 200)

-   {
-      if (error.empty() == false)
-        response.append("<p><em>Error</em>: ").append(error).append("</p>");
-      response.append("This error is a result of the request: <pre>");
-   }
+      response.append("<p><em>Error</em>: ");
+   else
+      response.append("<p><em>Success</em>: ");
+   if (error.empty() == false)
+      response.append(error);
+   else
+      response.append(httpcodeToStr(httpcode));
+   if (httpcode != 200)
+      response.append("</p>This error is a result of the request: <pre>");

    else
    else

-   {
-      if (error.empty() == false)
-        response.append("<p><em>Success</em>: ").append(error).append("</p>");

       response.append("The successfully executed operation was requested by: <pre>");
       response.append("The successfully executed operation was requested by: <pre>");

-   }

    response.append(request).append("</pre></body></html>");
    response.append(request).append("</pre></body></html>");

+   if (httpcode != 200)
+   {
+      if (_config->FindB("aptwebserver::closeOnError", false) == true)
+        headers.push_back("Connection: close");
+   }

    addDataHeaders(headers, response);
    sendHead(client, httpcode, headers);
    if (content == true)
    addDataHeaders(headers, response);
    sendHead(client, httpcode, headers);
    if (content == true)

-      sendData(client, response);
+      sendData(client, headers, response);

 }
 }

-void sendSuccess(int const client, std::string const &request,
-              bool content, std::string const &error = "")
+static void sendSuccess(int const client, std::string const &request,
+              bool const content, std::string const &error, std::list<std::string> &headers)

 {
 {

-   sendError(client, 200, request, content, error);
+   sendError(client, 200, request, content, error, headers);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-void sendRedirect(int const client, int const httpcode, std::string const &uri,/*{{{*/
+static void sendRedirect(int const client, int const httpcode, std::string const &uri,/*{{{*/

                  std::string const &request, bool content)
 {
    std::list<std::string> headers;
                  std::string const &request, bool content)
 {
    std::list<std::string> headers;


@@ -197,9 +250,14 @@ void sendRedirect(int const client, int const httpcode, std::string const &uri,/
    response.append(request).append("</pre></body></html>");
    addDataHeaders(headers, response);
    std::string location("Location: ");
    response.append(request).append("</pre></body></html>");
    addDataHeaders(headers, response);
    std::string location("Location: ");

-   if (strncmp(uri.c_str(), "http://", 7) != 0)
+   if (strncmp(uri.c_str(), "http://", 7) != 0 && strncmp(uri.c_str(), "https://", 8) != 0)

    {
    {

-      location.append("http://").append(LookupTag(request, "Host")).append("/");
+      std::string const host = LookupTag(request, "Host");
+      if (host.find(":4433") != std::string::npos)
+        location.append("https://");
+      else
+        location.append("http://");
+      location.append(host).append("/");

       if (strncmp("/home/", uri.c_str(), strlen("/home/")) == 0 && uri.find("/public_html/") != std::string::npos)
       {
         std::string homeuri = SubstVar(uri, "/home/", "~");
       if (strncmp("/home/", uri.c_str(), strlen("/home/")) == 0 && uri.find("/public_html/") != std::string::npos)
       {
         std::string homeuri = SubstVar(uri, "/home/", "~");


@@ -214,10 +272,10 @@ void sendRedirect(int const client, int const httpcode, std::string const &uri,/
    headers.push_back(location);
    sendHead(client, httpcode, headers);
    if (content == true)
    headers.push_back(location);
    sendHead(client, httpcode, headers);
    if (content == true)

-      sendData(client, response);
+      sendData(client, headers, response);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-int filter_hidden_files(const struct dirent *a)                                /*{{{*/
+static int filter_hidden_files(const struct dirent *a)                 /*{{{*/

 {
    if (a->d_name[0] == '.')
       return 0;
 {
    if (a->d_name[0] == '.')
       return 0;


@@ -231,7 +289,7 @@ int filter_hidden_files(const struct dirent *a)                             /*{{{*/
 #endif
    return 1;
 }
 #endif
    return 1;
 }

-int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) {
+static int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) {

 #ifdef _DIRENT_HAVE_D_TYPE
    if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_DIR);
    else if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_REG)
 #ifdef _DIRENT_HAVE_D_TYPE
    if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_DIR);
    else if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_REG)


@@ -255,17 +313,16 @@ int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) {
    return strcasecmp((*a)->d_name, (*b)->d_name);
 }
                                                                        /*}}}*/
    return strcasecmp((*a)->d_name, (*b)->d_name);
 }
                                                                        /*}}}*/

-void sendDirectoryListing(int const client, std::string const &dir,    /*{{{*/
-                         std::string const &request, bool content)
+static void sendDirectoryListing(int const client, std::string const &dir,/*{{{*/
+                         std::string const &request, bool content, std::list<std::string> &headers)

 {
 {

-   std::list<std::string> headers;

    std::ostringstream listing;
 
    struct dirent **namelist;
    int const counter = scandir(dir.c_str(), &namelist, filter_hidden_files, grouped_alpha_case_sort);
    if (counter == -1)
    {
    std::ostringstream listing;
 
    struct dirent **namelist;
    int const counter = scandir(dir.c_str(), &namelist, filter_hidden_files, grouped_alpha_case_sort);
    if (counter == -1)
    {

-      sendError(client, 500, request, content);
+      sendError(client, 500, request, content, "scandir failed", headers);

       return;
    }
 
       return;
    }
 


@@ -304,18 +361,18 @@ void sendDirectoryListing(int const client, std::string const &dir,       /*{{{*/
    addDataHeaders(headers, response);
    sendHead(client, 200, headers);
    if (content == true)
    addDataHeaders(headers, response);
    sendHead(client, 200, headers);
    if (content == true)

-      sendData(client, response);
+      sendData(client, headers, response);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-bool parseFirstLine(int const client, std::string const &request,      /*{{{*/
+static bool parseFirstLine(int const client, std::string const &request,/*{{{*/

                    std::string &filename, std::string &params, bool &sendContent,
                    std::string &filename, std::string &params, bool &sendContent,

-                   bool &closeConnection)
+                   bool &closeConnection, std::list<std::string> &headers)

 {
    if (strncmp(request.c_str(), "HEAD ", 5) == 0)
       sendContent = false;
    if (strncmp(request.c_str(), "GET ", 4) != 0)
    {
 {
    if (strncmp(request.c_str(), "HEAD ", 5) == 0)
       sendContent = false;
    if (strncmp(request.c_str(), "GET ", 4) != 0)
    {

-      sendError(client, 501, request, true);
+      sendError(client, 501, request, true, "", headers);

       return false;
    }
 
       return false;
    }
 


@@ -326,7 +383,7 @@ bool parseFirstLine(int const client, std::string const &request,   /*{{{*/
    if (lineend == std::string::npos || filestart == std::string::npos ||
         fileend == std::string::npos || filestart == fileend)
    {
    if (lineend == std::string::npos || filestart == std::string::npos ||
         fileend == std::string::npos || filestart == fileend)
    {

-      sendError(client, 500, request, sendContent, "Filename can't be extracted");
+      sendError(client, 500, request, sendContent, "Filename can't be extracted", headers);

       return false;
    }
 
       return false;
    }
 


@@ -338,14 +395,14 @@ bool parseFirstLine(int const client, std::string const &request, /*{{{*/
       closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "close") == 0;
    else
    {
       closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "close") == 0;
    else
    {

-      sendError(client, 500, request, sendContent, "Not a HTTP/1.{0,1} request");
+      sendError(client, 500, request, sendContent, "Not a HTTP/1.{0,1} request", headers);

       return false;
    }
 
    filename = request.substr(filestart, fileend - filestart);
    if (filename.find(' ') != std::string::npos)
    {
       return false;
    }
 
    filename = request.substr(filestart, fileend - filestart);
    if (filename.find(' ') != std::string::npos)
    {

-      sendError(client, 500, request, sendContent, "Filename contains an unencoded space");
+      sendError(client, 500, request, sendContent, "Filename contains an unencoded space", headers);

       return false;
    }
 
       return false;
    }
 


@@ -353,7 +410,7 @@ bool parseFirstLine(int const client, std::string const &request,   /*{{{*/
    if (host.empty() == true)
    {
       // RFC 2616 §14.23 requires Host
    if (host.empty() == true)
    {
       // RFC 2616 §14.23 requires Host

-      sendError(client, 400, request, sendContent, "Host header is required");
+      sendError(client, 400, request, sendContent, "Host header is required", headers);

       return false;
    }
    host = "http://" + host;
       return false;
    }
    host = "http://" + host;


@@ -364,7 +421,7 @@ bool parseFirstLine(int const client, std::string const &request,   /*{{{*/
    {
       if (absolute.find("uri") == std::string::npos)
       {
    {
       if (absolute.find("uri") == std::string::npos)
       {

-        sendError(client, 400, request, sendContent, "Request is absoluteURI, but configured to not accept that");
+        sendError(client, 400, request, sendContent, "Request is absoluteURI, but configured to not accept that", headers);

         return false;
       }
       // strip the host from the request to make it an absolute path
         return false;
       }
       // strip the host from the request to make it an absolute path


@@ -372,7 +429,7 @@ bool parseFirstLine(int const client, std::string const &request,   /*{{{*/
    }
    else if (absolute.find("path") == std::string::npos)
    {
    }
    else if (absolute.find("path") == std::string::npos)
    {

-      sendError(client, 400, request, sendContent, "Request is absolutePath, but configured to not accept that");
+      sendError(client, 400, request, sendContent, "Request is absolutePath, but configured to not accept that", headers);

       return false;
    }
 
       return false;
    }
 


@@ -391,7 +448,8 @@ bool parseFirstLine(int const client, std::string const &request,   /*{{{*/
        filename.find_first_of("\r\n\t\f\v") != std::string::npos ||
        filename.find("/../") != std::string::npos)
    {
        filename.find_first_of("\r\n\t\f\v") != std::string::npos ||
        filename.find("/../") != std::string::npos)
    {

-      sendError(client, 400, request, sendContent, "Filename contains illegal character (sequence)");
+      std::list<std::string> headers;
+      sendError(client, 400, request, sendContent, "Filename contains illegal character (sequence)", headers);

       return false;
    }
 
       return false;
    }
 


@@ -427,66 +485,69 @@ bool parseFirstLine(int const client, std::string const &request, /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool handleOnTheFlyReconfiguration(int const client, std::string const &request, std::vector<std::string> const &parts)/*{{{*/
+static bool handleOnTheFlyReconfiguration(int const client, std::string const &request,/*{{{*/
+      std::vector<std::string> parts, std::list<std::string> &headers)

 {
    size_t const pcount = parts.size();
    if (pcount == 4 && parts[1] == "set")
    {
       _config->Set(parts[2], parts[3]);
 {
    size_t const pcount = parts.size();
    if (pcount == 4 && parts[1] == "set")
    {
       _config->Set(parts[2], parts[3]);

-      sendSuccess(client, request, true, "Option '" + parts[2] + "' was set to '" + parts[3] + "'!");
+      sendSuccess(client, request, true, "Option '" + parts[2] + "' was set to '" + parts[3] + "'!", headers);

       return true;
    }
    else if (pcount == 4 && parts[1] == "find")
    {
       return true;
    }
    else if (pcount == 4 && parts[1] == "find")
    {

-      std::list<std::string> headers;

       std::string response = _config->Find(parts[2], parts[3]);
       addDataHeaders(headers, response);
       sendHead(client, 200, headers);
       std::string response = _config->Find(parts[2], parts[3]);
       addDataHeaders(headers, response);
       sendHead(client, 200, headers);

-      sendData(client, response);
+      sendData(client, headers, response);

       return true;
    }
    else if (pcount == 3 && parts[1] == "find")
    {
       return true;
    }
    else if (pcount == 3 && parts[1] == "find")
    {

-      std::list<std::string> headers;

       if (_config->Exists(parts[2]) == true)
       {
         std::string response = _config->Find(parts[2]);
         addDataHeaders(headers, response);
         sendHead(client, 200, headers);
       if (_config->Exists(parts[2]) == true)
       {
         std::string response = _config->Find(parts[2]);
         addDataHeaders(headers, response);
         sendHead(client, 200, headers);

-        sendData(client, response);
+        sendData(client, headers, response);

         return true;
       }
         return true;
       }

-      sendError(client, 404, request, "Requested Configuration option doesn't exist.");
+      sendError(client, 404, request, true, "Requested Configuration option doesn't exist", headers);

       return false;
    }
    else if (pcount == 3 && parts[1] == "clear")
    {
       _config->Clear(parts[2]);
       return false;
    }
    else if (pcount == 3 && parts[1] == "clear")
    {
       _config->Clear(parts[2]);

-      sendSuccess(client, request, true, "Option '" + parts[2] + "' was cleared.");
+      sendSuccess(client, request, true, "Option '" + parts[2] + "' was cleared.", headers);

       return true;
    }
 
       return true;
    }
 

-   sendError(client, 400, request, true, "Unknown on-the-fly configuration request");
+   sendError(client, 400, request, true, "Unknown on-the-fly configuration request", headers);

    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

-void * handleClient(void * voidclient)                                 /*{{{*/
+static void * handleClient(void * voidclient)                          /*{{{*/

 {
    int client = *((int*)(voidclient));
    std::clog << "ACCEPT client " << client << std::endl;
    std::vector<std::string> messages;
 {
    int client = *((int*)(voidclient));
    std::clog << "ACCEPT client " << client << std::endl;
    std::vector<std::string> messages;

-   while (ReadMessages(client, messages))
+   bool closeConnection = false;
+   std::list<std::string> headers;
+   while (closeConnection == false && ReadMessages(client, messages))

    {
    {

-      bool closeConnection = false;
+      // if we announced a closing, do the close
+      if (std::find(headers.begin(), headers.end(), std::string("Connection: close")) != headers.end())
+        break;
+      headers.clear();

       for (std::vector<std::string>::const_iterator m = messages.begin();
            m != messages.end() && closeConnection == false; ++m) {
         std::clog << ">>> REQUEST from " << client << " >>>" << std::endl << *m
            << std::endl << "<<<<<<<<<<<<<<<<" << std::endl;
       for (std::vector<std::string>::const_iterator m = messages.begin();
            m != messages.end() && closeConnection == false; ++m) {
         std::clog << ">>> REQUEST from " << client << " >>>" << std::endl << *m
            << std::endl << "<<<<<<<<<<<<<<<<" << std::endl;

-        std::list<std::string> headers;

         std::string filename;
         std::string params;
         bool sendContent = true;
         std::string filename;
         std::string params;
         bool sendContent = true;

-        if (parseFirstLine(client, *m, filename, params, sendContent, closeConnection) == false)
+        if (parseFirstLine(client, *m, filename, params, sendContent, closeConnection, headers) == false)

            continue;
 
         // special webserver command request
            continue;
 
         // special webserver command request


@@ -495,7 +556,7 @@ void * handleClient(void * voidclient)                                      /*{{{*/
            std::vector<std::string> parts = VectorizeString(filename, '/');
            if (parts[0] == "_config")
            {
            std::vector<std::string> parts = VectorizeString(filename, '/');
            if (parts[0] == "_config")
            {

-              handleOnTheFlyReconfiguration(client, *m, parts);
+              handleOnTheFlyReconfiguration(client, *m, parts, headers);

               continue;
            }
         }
               continue;
            }
         }


@@ -507,7 +568,8 @@ void * handleClient(void * voidclient)                                      /*{{{*/
            std::string redirect = "/" + filename;
            for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next)
               redirect = SubstVar(redirect, I->Tag, I->Value);
            std::string redirect = "/" + filename;
            for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next)
               redirect = SubstVar(redirect, I->Tag, I->Value);

-           redirect.erase(0,1);
+           if (redirect.empty() == false && redirect[0] == '/')
+              redirect.erase(0,1);

            if (redirect != filename)
            {
               sendRedirect(client, 301, redirect, *m, sendContent);
            if (redirect != filename)
            {
               sendRedirect(client, 301, redirect, *m, sendContent);


@@ -526,7 +588,7 @@ void * handleClient(void * voidclient)                                      /*{{{*/
               {
                  char error[300];
                  regerror(res, pattern, error, sizeof(error));
               {
                  char error[300];
                  regerror(res, pattern, error, sizeof(error));

-                 sendError(client, 500, *m, sendContent, error);
+                 sendError(client, 500, *m, sendContent, error, headers);

                  continue;
               }
               if (regexec(pattern, filename.c_str(), 0, 0, 0) == 0)
                  continue;
               }
               if (regexec(pattern, filename.c_str(), 0, 0, 0) == 0)


@@ -542,7 +604,13 @@ void * handleClient(void * voidclient)                                     /*{{{*/
         }
 
         // deal with the request
         }
 
         // deal with the request

-        if (RealFileExists(filename) == true)
+        if (_config->FindB("aptwebserver::support::http", true) == false &&
+              LookupTag(*m, "Host").find(":4433") == std::string::npos)
+        {
+           sendError(client, 400, *m, sendContent, "HTTP disabled, all requests must be HTTPS", headers);
+           continue;
+        }
+        else if (RealFileExists(filename) == true)

         {
            FileFd data(filename, FileFd::ReadOnly);
            std::string condition = LookupTag(*m, "If-Modified-Since", "");
         {
            FileFd data(filename, FileFd::ReadOnly);
            std::string condition = LookupTag(*m, "If-Modified-Since", "");


@@ -586,26 +654,27 @@ void * handleClient(void * voidclient)                                    /*{{{*/
                     if (filesize > filestart)
                     {
                        data.Skip(filestart);
                     if (filesize > filestart)
                     {
                        data.Skip(filestart);

-                       std::ostringstream contentlength;
-                       contentlength << "Content-Length: " << (filesize - filestart);
-                       headers.push_back(contentlength.str());
+                        // make sure to send content-range before conent-length
+                        // as regression test for LP: #1445239

                        std::ostringstream contentrange;
                        contentrange << "Content-Range: bytes " << filestart << "-"
                           << filesize - 1 << "/" << filesize;
                        headers.push_back(contentrange.str());
                        std::ostringstream contentrange;
                        contentrange << "Content-Range: bytes " << filestart << "-"
                           << filesize - 1 << "/" << filesize;
                        headers.push_back(contentrange.str());

+                       std::ostringstream contentlength;
+                       contentlength << "Content-Length: " << (filesize - filestart);
+                       headers.push_back(contentlength.str());

                        sendHead(client, 206, headers);
                        if (sendContent == true)
                        sendHead(client, 206, headers);
                        if (sendContent == true)

-                          sendFile(client, data);
+                          sendFile(client, headers, data);

                        continue;
                     }
                     else
                     {
                        continue;
                     }
                     else
                     {

-                       headers.push_back("Content-Length: 0");

                        std::ostringstream contentrange;
                        contentrange << "Content-Range: bytes */" << filesize;
                        headers.push_back(contentrange.str());
                        std::ostringstream contentrange;
                        contentrange << "Content-Range: bytes */" << filesize;
                        headers.push_back(contentrange.str());

-                       sendHead(client, 416, headers);
-                       continue;
+                       sendError(client, 416, *m, sendContent, "", headers);
+                       break;

                     }
                  }
               }
                     }
                  }
               }


@@ -614,22 +683,20 @@ void * handleClient(void * voidclient)                                    /*{{{*/
            addFileHeaders(headers, data);
            sendHead(client, 200, headers);
            if (sendContent == true)
            addFileHeaders(headers, data);
            sendHead(client, 200, headers);
            if (sendContent == true)

-              sendFile(client, data);
+              sendFile(client, headers, data);

         }
         else if (DirectoryExists(filename) == true)
         {
            if (filename[filename.length()-1] == '/')
         }
         else if (DirectoryExists(filename) == true)
         {
            if (filename[filename.length()-1] == '/')

-              sendDirectoryListing(client, filename, *m, sendContent);
+              sendDirectoryListing(client, filename, *m, sendContent, headers);

            else
               sendRedirect(client, 301, filename.append("/"), *m, sendContent);
         }
         else
            else
               sendRedirect(client, 301, filename.append("/"), *m, sendContent);
         }
         else

-           sendError(client, 404, *m, sendContent);
+           sendError(client, 404, *m, sendContent, "", headers);

       }
       _error->DumpErrors(std::cerr);
       messages.clear();
       }
       _error->DumpErrors(std::cerr);
       messages.clear();

-      if (closeConnection == true)
-        break;

    }
    close(client);
    std::clog << "CLOSE client " << client << std::endl;
    }
    close(client);
    std::clog << "CLOSE client " << client << std::endl;