Bläddra i källkod

Update CREDITS, RELEASE_NOTES and line indent

bel 10 år sedan
förälder
incheckning
2e13beb535
3 ändrade filer med 12 tillägg och 10 borttagningar
  1. 1 0
      CREDITS.md
  2. 3 1
      RELEASE_NOTES.md
  3. 8 9
      src/civetweb.c

+ 1 - 0
CREDITS.md

@@ -10,6 +10,7 @@
 * F-Secure Corporation
 * F-Secure Corporation
 * HariKamath Kamath
 * HariKamath Kamath
 * Jordan Shelley
 * Jordan Shelley
+* Keith Kyzivat
 * Kimmo Mustonen
 * Kimmo Mustonen
 * Morgan McGuire
 * Morgan McGuire
 * No Face Press
 * No Face Press

+ 3 - 1
RELEASE_NOTES.md

@@ -1,10 +1,12 @@
 Release Notes v1.7 (Under Development)
 Release Notes v1.7 (Under Development)
 ===
 ===
-### Objectives: *Examples, documentation, additional API functions, rewritten handle_request method, bug fixes and updates*
+### Objectives: *Examples, documentation, additional API functions, chunked transfer support, rewritten handle_request method, bug fixes and updates*
 
 
 Changes
 Changes
 -------
 -------
 
 
+- Add chunked transfer support
+- Update LuaFileSystem
 - Update Lua to 5.2.4
 - Update Lua to 5.2.4
 - Fix build for MinGW-x64, TDM-GCC and clang
 - Fix build for MinGW-x64, TDM-GCC and clang
 - Update SQLite to 3.8.8.3
 - Update SQLite to 3.8.8.3

+ 8 - 9
src/civetweb.c

@@ -2622,8 +2622,7 @@ int mg_read_inner(struct mg_connection *conn, void *buf, size_t len)
             buf = (char *) buf + buffered_len;
             buf = (char *) buf + buffered_len;
         }
         }
 
 
-        /* We have returned all buffered data. Read new data from the remote
-           socket. */
+        /* We have returned all buffered data. Read new data from the remote socket. */
         if ((n = pull_all(NULL, conn, (char *) buf, (int)len64)) >= 0) {
         if ((n = pull_all(NULL, conn, (char *) buf, (int)len64)) >= 0) {
             nread += n;
             nread += n;
         } else {
         } else {
@@ -2635,13 +2634,13 @@ int mg_read_inner(struct mg_connection *conn, void *buf, size_t len)
 
 
 static int mg_getc(struct mg_connection *conn)
 static int mg_getc(struct mg_connection *conn)
 {
 {
-  char c;
-  conn->content_len++;
-  if (mg_read_inner(conn, &c, 1) <= 0)
-  {
-      return EOF;
-  }
-  return (int)c;
+    char c;
+    conn->content_len++;
+    if (mg_read_inner(conn, &c, 1) <= 0)
+    {
+        return EOF;
+    }
+    return (int)c;
 }
 }
 
 
 int mg_read(struct mg_connection *conn, void *buf, size_t len)
 int mg_read(struct mg_connection *conn, void *buf, size_t len)