From f38803f919ec304be74dc4a35471ae1661cca0f3 Mon Sep 17 00:00:00 2001 From: LazyPanda07 Date: Mon, 11 May 2026 01:29:50 +0500 Subject: [PATCH 1/4] Fix --- API/CC_API/include/json_parser.h | 2 +- API/CC_API/src/json_parser.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/API/CC_API/include/json_parser.h b/API/CC_API/include/json_parser.h index 3d143e29..91c8337d 100644 --- a/API/CC_API/include/json_parser.h +++ b/API/CC_API/include/json_parser.h @@ -206,4 +206,4 @@ bool wf_try_get_json_parser_array(json_parser_t implementation, const char* key, * @param weak If true, request a non-owning (weak) reference to the parsed data * @return Error if occurred */ -web_framework_exception_t* wf_get_parsed_data(json_parser_t implementation, json_object_t* result, bool weak); +web_framework_exception_t* wf_get_json_parser_parsed_data(json_parser_t implementation, json_object_t* result, bool weak); diff --git a/API/CC_API/src/json_parser.c b/API/CC_API/src/json_parser.c index 25b6690a..3b160015 100644 --- a/API/CC_API/src/json_parser.c +++ b/API/CC_API/src/json_parser.c @@ -243,16 +243,16 @@ bool wf_try_get_json_parser_array(json_parser_t implementation, const char* key, return result; } -web_framework_exception_t* wf_get_parsed_data(json_parser_t implementation, json_object_t* result, bool weak) +web_framework_exception_t* wf_get_json_parser_parsed_data(json_parser_t implementation, json_object_t* result, bool weak) { typedef void* (*getJsonParserParsedData)(void* implementation, bool weak, void** exception); void* exception = NULL; - void* result = CALL_CLASS_MEMBER_WEB_FRAMEWORK_FUNCTION(getJsonParserParsedData, weak, &exception); + void* temp = CALL_CLASS_MEMBER_WEB_FRAMEWORK_FUNCTION(getJsonParserParsedData, weak, &exception); *result = (json_object_t) { - .implementation = result, + .implementation = temp, .weak = weak }; From e7e181dcb551f6c3b40ed7584e55107a42c0f007 Mon Sep 17 00:00:00 2001 From: LazyPanda07 Date: Mon, 11 May 2026 04:07:04 +0500 Subject: [PATCH 2/4] Fix wf_get_error_message --- API/CC_API/src/web_framework_exception.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/API/CC_API/src/web_framework_exception.c b/API/CC_API/src/web_framework_exception.c index e5c47237..d8396073 100644 --- a/API/CC_API/src/web_framework_exception.c +++ b/API/CC_API/src/web_framework_exception.c @@ -4,7 +4,9 @@ const char* wf_get_error_message(web_framework_exception_t exception) { if (exception) { - return wf_get_data_from_string(exception); + typedef const char* (*getErrorMessage)(void* exception); + + return CALL_WEB_FRAMEWORK_FUNCTION(getErrorMessage, exception); } return NULL; From 5c6d54415c0889774c05d69719c4d3060dfbc5e9 Mon Sep 17 00:00:00 2001 From: LazyPanda07 Date: Mon, 11 May 2026 04:33:10 +0500 Subject: [PATCH 3/4] Test --- API/CC_API/src/json_object.c | 8 +++++++- API/CC_API/src/json_parser.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/API/CC_API/src/json_object.c b/API/CC_API/src/json_object.c index ac0a86af..2d6e2a73 100644 --- a/API/CC_API/src/json_object.c +++ b/API/CC_API/src/json_object.c @@ -14,7 +14,13 @@ static void __add_array_callback(void* object, void* array) exit(0xff); } - wf_set_json_object_object(&element, (json_object_t*)object); + json_object_t temp = + { + .implementation = object, + .weak = true + }; + + wf_set_json_object_object(&element, &temp); } web_framework_exception_t wf_create_json_object(json_object_t* json_object) diff --git a/API/CC_API/src/json_parser.c b/API/CC_API/src/json_parser.c index 3b160015..8ae63bad 100644 --- a/API/CC_API/src/json_parser.c +++ b/API/CC_API/src/json_parser.c @@ -14,7 +14,13 @@ static void __add_array_callback(void* object, void* array) exit(0xff); } - wf_set_json_object_object(&element, (json_object_t*)object); + json_object_t temp = + { + .implementation = object, + .weak = true + }; + + wf_set_json_object_object(&element, &temp); } web_framework_exception_t wf_create_json_parser(json_parser_t* parser) From e3b108364b438b25dc8a2749be31044b8159ebd6 Mon Sep 17 00:00:00 2001 From: LazyPanda07 Date: Mon, 11 May 2026 04:44:20 +0500 Subject: [PATCH 4/4] Update versions --- .github/workflows/distribution.yml | 4 ++-- .github/workflows/docker_distribution.yml | 4 ++-- API/CC_API/CMakeLists.txt | 2 +- API/CSharp_API/WebFrameworkCSharpAPI.csproj | 6 +++--- API/CXX_API/CMakeLists.txt | 2 +- API/Python_API/CMakeLists.txt | 2 +- API/Python_API/pyproject.toml | 2 +- API/web_framework_flutter_api/CHANGELOG.md | 3 +++ API/web_framework_flutter_api/pubspec.yaml | 2 +- CMakeLists.txt | 2 +- Docker/web_framework_deploy/Dockerfile | 4 ++-- Docker/web_framework_dev/Dockerfile | 2 +- WebFramework/src/C_API/WebFrameworkCApi.cpp | 2 +- deb_packages/web-framework-dev/DEBIAN/control | 2 +- deb_packages/web-framework/DEBIAN/control | 2 +- 15 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/distribution.yml b/.github/workflows/distribution.yml index 301509c6..c5aeb031 100644 --- a/.github/workflows/distribution.yml +++ b/.github/workflows/distribution.yml @@ -6,8 +6,8 @@ on: env: - deb-package-version: 3.4.1 - deb-package-release-number: 23 + deb-package-version: 3.4.2 + deb-package-release-number: 24 PYTHON_VERSION: 3.14 TWINE_PYTHON_VERSION: 3.13 diff --git a/.github/workflows/docker_distribution.yml b/.github/workflows/docker_distribution.yml index 9bdb47fb..6de85bff 100644 --- a/.github/workflows/docker_distribution.yml +++ b/.github/workflows/docker_distribution.yml @@ -6,8 +6,8 @@ on: env: - WEB_FRAMEWORK_DEPLOY_VERSION: 3.4.1 - WEB_FRAMEWORK_DEV_VERSION: 3.4.1 + WEB_FRAMEWORK_DEPLOY_VERSION: 3.4.2 + WEB_FRAMEWORK_DEV_VERSION: 3.4.2 PYTHON_VERSION: 3.14 diff --git a/API/CC_API/CMakeLists.txt b/API/CC_API/CMakeLists.txt index eae6b3d2..787a5778 100644 --- a/API/CC_API/CMakeLists.txt +++ b/API/CC_API/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.27.0) set(CMAKE_C_STANDARD 11) -project(CC_API VERSION 3.4.1) +project(CC_API VERSION 3.4.2) add_library( ${PROJECT_NAME} STATIC diff --git a/API/CSharp_API/WebFrameworkCSharpAPI.csproj b/API/CSharp_API/WebFrameworkCSharpAPI.csproj index 0e68d0da..54d97301 100644 --- a/API/CSharp_API/WebFrameworkCSharpAPI.csproj +++ b/API/CSharp_API/WebFrameworkCSharpAPI.csproj @@ -17,9 +17,9 @@ web;server;framework LICENSE True - 3.4.1 - 3.4.1 - 3.4.1 + 3.4.2 + 3.4.2 + 3.4.2 diff --git a/API/CXX_API/CMakeLists.txt b/API/CXX_API/CMakeLists.txt index f92e5018..d5ad2953 100644 --- a/API/CXX_API/CMakeLists.txt +++ b/API/CXX_API/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.27.0) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) -project(CXX_API VERSION 3.4.1) +project(CXX_API VERSION 3.4.2) add_library(${PROJECT_NAME} INTERFACE) diff --git a/API/Python_API/CMakeLists.txt b/API/Python_API/CMakeLists.txt index ba064c4b..47085763 100644 --- a/API/Python_API/CMakeLists.txt +++ b/API/Python_API/CMakeLists.txt @@ -32,7 +32,7 @@ if (UNIX) add_definitions(-D__LINUX__) endif(UNIX) -project(web_framework_api VERSION 3.4.1) +project(web_framework_api VERSION 3.4.2) if (UNIX) add_definitions(-D__LINUX__) diff --git a/API/Python_API/pyproject.toml b/API/Python_API/pyproject.toml index 53f3490e..00a1714e 100644 --- a/API/Python_API/pyproject.toml +++ b/API/Python_API/pyproject.toml @@ -15,7 +15,7 @@ maintainers = [ { name = "LazyPanda07", email = "semengricenko@gmail.com" } ] keywords = ["Web"] -version = "3.4.1" +version = "3.4.2" classifiers = [ "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", diff --git a/API/web_framework_flutter_api/CHANGELOG.md b/API/web_framework_flutter_api/CHANGELOG.md index 8dc698ea..85a4dec9 100644 --- a/API/web_framework_flutter_api/CHANGELOG.md +++ b/API/web_framework_flutter_api/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.4.2 +* Update WebFramework to v3.4.2 + ## 3.4.1 * Update WebFramework to v3.4.1 diff --git a/API/web_framework_flutter_api/pubspec.yaml b/API/web_framework_flutter_api/pubspec.yaml index fd4d94c0..0b81e296 100644 --- a/API/web_framework_flutter_api/pubspec.yaml +++ b/API/web_framework_flutter_api/pubspec.yaml @@ -1,6 +1,6 @@ name: web_framework_flutter_api description: "C++ HTTP/HTTPS web server with Flutter API for Android and Windows" -version: 3.4.1 +version: 3.4.2 homepage: https://github.com/Lazypanda07/WebFramework environment: diff --git a/CMakeLists.txt b/CMakeLists.txt index 09227fc3..23cc54d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ option(WITH_DOTNET_EXECUTORS "Build with .NET Executors" ON) option(WITH_UNITY_BUILD "Build few .cpp at once" ON) option(AS_DEPENDENCY "Change install paths for FetchContent or add_subdirectory usage" OFF) -project(WebFramework VERSION 3.4.1) +project(WebFramework VERSION 3.4.2) set(SHARED_LIBRARY_PROJECT_NAME ${PROJECT_NAME}) diff --git a/Docker/web_framework_deploy/Dockerfile b/Docker/web_framework_deploy/Dockerfile index 69a0ac16..8bcfec06 100644 --- a/Docker/web_framework_deploy/Dockerfile +++ b/Docker/web_framework_deploy/Dockerfile @@ -8,7 +8,7 @@ RUN mkdir -p web_framework_server/build WORKDIR /web_framework_server/build # Update version -RUN cmake -DCMAKE_INSTALL_PREFIX=bin -DWEB_FRAMEWORK_TAG=v3.4.1 -G "Ninja" .. +RUN cmake -DCMAKE_INSTALL_PREFIX=bin -DWEB_FRAMEWORK_TAG=v3.4.2 -G "Ninja" .. RUN cmake --build . RUN cmake --install . RUN mkdir /opt/web_framework_server && cp /web_framework_server/build/bin/web_framework_server /opt/web_framework_server @@ -35,7 +35,7 @@ RUN curl -s --compressed -o /etc/apt/sources.list.d/web_framework.list "https:// RUN apt update # Update version -RUN apt install -y web-framework=3.4.1 +RUN apt install -y web-framework=3.4.2 WORKDIR /opt/web_framework_server diff --git a/Docker/web_framework_dev/Dockerfile b/Docker/web_framework_dev/Dockerfile index 2d19f02d..68d937d1 100644 --- a/Docker/web_framework_dev/Dockerfile +++ b/Docker/web_framework_dev/Dockerfile @@ -36,4 +36,4 @@ RUN curl -s --compressed -o /etc/apt/sources.list.d/web_framework.list "https:// RUN apt update # Update version -RUN apt install -y web-framework-dev=3.4.1 +RUN apt install -y web-framework-dev=3.4.2 diff --git a/WebFramework/src/C_API/WebFrameworkCApi.cpp b/WebFramework/src/C_API/WebFrameworkCApi.cpp index b2d0adbc..fc3b3316 100644 --- a/WebFramework/src/C_API/WebFrameworkCApi.cpp +++ b/WebFramework/src/C_API/WebFrameworkCApi.cpp @@ -266,7 +266,7 @@ bool isServerRunning(WebFramework server, Exception* exception) const char* getWebFrameworkVersion() { - constexpr std::string_view version = "3.4.1"; + constexpr std::string_view version = "3.4.2"; return version.data(); } diff --git a/deb_packages/web-framework-dev/DEBIAN/control b/deb_packages/web-framework-dev/DEBIAN/control index b1ec861c..c6bd5bc8 100644 --- a/deb_packages/web-framework-dev/DEBIAN/control +++ b/deb_packages/web-framework-dev/DEBIAN/control @@ -1,5 +1,5 @@ Package: web-framework-dev -Version: 3.4.1 +Version: 3.4.2 Maintainer: lazypanda07 semengricenko@gmail.com Depends: build-essential | clang, uuid-dev Architecture: amd64 diff --git a/deb_packages/web-framework/DEBIAN/control b/deb_packages/web-framework/DEBIAN/control index d873b2fd..6825dfff 100644 --- a/deb_packages/web-framework/DEBIAN/control +++ b/deb_packages/web-framework/DEBIAN/control @@ -1,5 +1,5 @@ Package: web-framework -Version: 3.4.1 +Version: 3.4.2 Maintainer: lazypanda07 semengricenko@gmail.com Architecture: amd64 Homepage: https://github.com/LazyPanda07/WebFramework