Skip to content
Merged

Dev #100

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker_distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion API/CC_API/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion API/CC_API/include/json_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
8 changes: 7 additions & 1 deletion API/CC_API/src/json_object.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 10 additions & 4 deletions API/CC_API/src/json_parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -243,16 +249,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
};

Expand Down
4 changes: 3 additions & 1 deletion API/CC_API/src/web_framework_exception.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions API/CSharp_API/WebFrameworkCSharpAPI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<PackageTags>web;server;framework</PackageTags>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<AssemblyVersion>3.4.1</AssemblyVersion>
<FileVersion>3.4.1</FileVersion>
<Version>3.4.1</Version>
<AssemblyVersion>3.4.2</AssemblyVersion>
<FileVersion>3.4.2</FileVersion>
<Version>3.4.2</Version>
</PropertyGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
Expand Down
2 changes: 1 addition & 1 deletion API/CXX_API/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion API/Python_API/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
2 changes: 1 addition & 1 deletion API/Python_API/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions API/web_framework_flutter_api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 3.4.2
* Update WebFramework to v3.4.2

## 3.4.1
* Update WebFramework to v3.4.1

Expand Down
2 changes: 1 addition & 1 deletion API/web_framework_flutter_api/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
4 changes: 2 additions & 2 deletions Docker/web_framework_deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Docker/web_framework_dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion WebFramework/src/C_API/WebFrameworkCApi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion deb_packages/web-framework-dev/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion deb_packages/web-framework/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading