Merge remote-tracking branch 'refs/remotes/origin/master'

diff --cc http.c
index dce3cc86d8a81686abd9d483b60d921a2a6ec63e,d2bd044e7374fae2a679e2c111eee4fc147d93db..4c37459136c6558bb77d4660c686d07342cd61c6
--- 1/http.c
--- 2/http.c
+++ b/http.c
@@@ -338,7 -330,8 +331,8 @@@ int processing (char *data, int len, ch
      char *buffer = NULL;
      switch (type) {
      case get_e:
 -        len = readfile ((unsigned char **)&buffer, filename);
+         VERBOSE (DEBUG, PRINT ("Read file %s\n", filename));
 +        len = readfile (&buffer, filename);
          if (len == 0) {
              len = error_404 (pdata, "http://localhost/");
          } else {

diff --cc webserver.c
index a88b5864460432c6454ba4abe0e0d24e63db2e14,b5d6039995c0ba3e1500212577f2d5da0e949c66..99e2d20f3ec740effd4759884aa4f521faaaf711
--- 1/webserver.c
--- 2/webserver.c
+++ b/webserver.c
@@@ -130,7 -130,8 +130,8 @@@ int main (int argc, char *argv[]
  
          VERBOSE (DEBUG, PRINT ("Server connected, waiting for data\n"));
  
-         char *data = {0};
 -        unsigned char *data = NULL;
 -        unsigned char *output = NULL;
++        char *data = NULL;
++        char *output = NULL;
  
          int len = receive_data (&data);
          if (len == 0) {
@@@ -142,9 -143,10 +143,10 @@@
  
              // processing
              VERBOSE (DEBUG, PRINT ("Processing %s\n", data));
-             len = processing ((char *)data, len, root, (char **)&data);
 -            len = processing ((char *)data, len, root, (char **)&output);
++            len = processing (data, len, root, &output);
  
-             int rc = send_data (data, len);
+             VERBOSE (DEBUG, PRINT ("Sending data (%d)\n%s\n", len, data));
+             int rc = send_data (output, len);
              if (rc == 0) {
                  VERBOSE (WARNING, PRINT ("Connection closed by peer (tx)\n"));
              } else if (rc < 0) {