From: Laurent Mazet <laurent.mazet@thalesgroup.com>
Date: Wed, 24 May 2023 11:48:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master'
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=135b5dee0e7ed1e8cb9929fe78e72b9fa0fa7ece;p=webserver.git

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

135b5dee0e7ed1e8cb9929fe78e72b9fa0fa7ece
diff --cc http.c
index dce3cc8,d2bd044..4c37459
--- a/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:
+         VERBOSE (DEBUG, PRINT ("Read file %s\n", filename));
 -        len = readfile ((unsigned char **)&buffer, filename);
 +        len = readfile (&buffer, filename);
          if (len == 0) {
              len = error_404 (pdata, "http://localhost/");
          } else {
diff --cc webserver.c
index a88b586,b5d6039..99e2d20
--- a/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) {