Merge pull request #288 from simon987/dev

v2.12.1
Merge pull request #285 from simon987/dependabot/npm_and_yarn/sist2-vue/async-2.6.4
2025-12-20 10:36:00 +00:00 · 2022-04-23 10:30:19 -04:00 · 2022-04-17 13:42:40 -04:00 · 2022-04-17 17:41:14 +00:00 · 2022-04-17 13:38:42 -04:00
3 changed files with 10 additions and 14 deletions
--- a/sist2-vue/package-lock.json
+++ b/sist2-vue/package-lock.json
@@ -3288,9 +3288,9 @@
      }
    },
    "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
      "dev": true,
      "dependencies": {
        "lodash": "^4.17.14"
@@ -17937,9 +17937,9 @@
      "dev": true
    },
    "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
      "dev": true,
      "requires": {
        "lodash": "^4.17.14"
--- a/src/sist.h
+++ b/src/sist.h
@@ -49,14 +49,14 @@
 #include <ctype.h>
 #include "git_hash.h"

-#define VERSION "2.12.2"
+#define VERSION "2.12.1"
 static const char *const Version = VERSION;

 #ifndef SIST_PLATFORM
 #define SIST_PLATFORM unknown
 #endif

-#define EXPECTED_MONGOOSE_VERSION "7.7"
+#define EXPECTED_MONGOOSE_VERSION "7.6"

 #define Q(x) #x
 #define QUOTE(x) Q(x)
--- a/src/web/serve.c
+++ b/src/web/serve.c
@@ -285,12 +285,8 @@ void serve_file_from_disk(cJSON *json, index_t *idx, struct mg_connection *nc, s
             "Accept-Ranges: bytes\r\nCache-Control: no-store\r\n",
             name, strlen(ext) == 0 ? "" : ".", ext);

-    char mime_mapping[8192];
-    if (strlen(ext) == 0) {
-        snprintf(mime_mapping, sizeof(mime_mapping), "%s=%s", full_path, mime);
-    } else {
-        snprintf(mime_mapping, sizeof(mime_mapping), "%s=%s", ext, mime);
-    }
+    char mime_mapping[1024];
+    snprintf(mime_mapping, sizeof(mime_mapping), "%s=%s", ext, mime);

    struct mg_http_serve_opts opts = {
            .extra_headers = disposition,
Author	SHA1	Message	Date
simon987	4e1109c528	Merge pull request #288 from simon987/dev v2.12.1	2022-04-23 10:30:19 -04:00
simon987	a74726be55	Merge pull request #285 from simon987/dependabot/npm_and_yarn/sist2-vue/async-2.6.4 Bump async from 2.6.3 to 2.6.4 in /sist2-vue	2022-04-17 13:42:40 -04:00
dependabot[bot]	cb228052d2	Bump async from 2.6.3 to 2.6.4 in /sist2-vue Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-17 17:41:14 +00:00
simon987	fe56da95d5	Merge pull request #284 from simon987/dev v2.12.0	2022-04-17 13:38:42 -04:00