From 2abed6b5f382773493e72847c7e2b3f3f747c1ad Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Fri, 29 Jul 2016 11:41:04 -0500 Subject: [PATCH 1/4] Fixes #1331 --- Net/src/HTMLForm.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Net/src/HTMLForm.cpp b/Net/src/HTMLForm.cpp index 24ee4a60b..ae74f128d 100644 --- a/Net/src/HTMLForm.cpp +++ b/Net/src/HTMLForm.cpp @@ -230,6 +230,10 @@ void HTMLForm::prepareSubmit(HTTPRequest& request) { request.setChunkedTransferEncoding(true); } + if (!request.getChunkedTransferEncoding()) + { + request.setContentLength(calculateContentLength()); + } } else { From beae6912ee43c30afee83a1341f7ed41a7af22a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Sat, 30 Jul 2016 10:49:00 +0200 Subject: [PATCH 2/4] Revert "Fixes #1331 - Poco::HTMLForm fails to set content length for HTTPMessage::HTTP_1_0 for ENCODING_MULTIPART" --- Net/src/HTMLForm.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Net/src/HTMLForm.cpp b/Net/src/HTMLForm.cpp index ae74f128d..24ee4a60b 100644 --- a/Net/src/HTMLForm.cpp +++ b/Net/src/HTMLForm.cpp @@ -230,10 +230,6 @@ void HTMLForm::prepareSubmit(HTTPRequest& request) { request.setChunkedTransferEncoding(true); } - if (!request.getChunkedTransferEncoding()) - { - request.setContentLength(calculateContentLength()); - } } else { From 8f18420ff9f1190cd6830d96680f385eb4d51822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Tue, 18 Oct 2016 14:37:46 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 82a372619..32731ace5 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ POCO C++ Libraries Build Status ------------ -- Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=poco-1.7.6)](https://travis-ci.org/pocoproject/poco) -- AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae/branch/poco-1.7.6?svg=true)](https://ci.appveyor.com/project/obiltschnig/poco/branch/poco-1.7.6) +- Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=master)](https://travis-ci.org/pocoproject/poco) +- AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae/branch/master?svg=true)](https://ci.appveyor.com/project/obiltschnig/poco/branch/master) - [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/370/badge)](https://bestpractices.coreinfrastructure.org/projects/370) From 66c0cc211fb3f8eaacb44a49bee86f991acc90d4 Mon Sep 17 00:00:00 2001 From: daB0bby Date: Sat, 31 Dec 2016 13:14:18 +0100 Subject: [PATCH 4/4] Keeps code-style consistency --- CMakeLists.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69e2053e7..97f1bf3ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ project(Poco) file(STRINGS "${PROJECT_SOURCE_DIR}/libversion" SHARED_LIBRARY_VERSION) # Read the version information from the VERSION file -file (STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PACKAGE_VERSION ) +file(STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PACKAGE_VERSION) message(STATUS "Poco package version: ${PACKAGE_VERSION}") string(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION}) string(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION}) @@ -49,8 +49,8 @@ if(NOT MSVC_IDE) message(STATUS "Setting Poco build type - ${CMAKE_BUILD_TYPE}") endif() -if (CMAKE_BUILD_TYPE STREQUAL "") - set( CMAKE_BUILD_TYPE "RelWithDebInfo" ) +if(CMAKE_BUILD_TYPE STREQUAL "") + set(CMAKE_BUILD_TYPE "RelWithDebInfo") endif() # Include some common macros to simpilfy the Poco CMake files @@ -99,38 +99,38 @@ endif() # Uncomment from next two lines to force static or dynamic library, default is autodetection if(POCO_STATIC) - set( LIB_MODE_DEFINITIONS -DPOCO_STATIC -DPOCO_NO_AUTOMATIC_LIBS) - set( LIB_MODE STATIC ) + set(LIB_MODE_DEFINITIONS -DPOCO_STATIC -DPOCO_NO_AUTOMATIC_LIBS) + set(LIB_MODE STATIC) message(STATUS "Building static libraries") else(POCO_STATIC) - set( LIB_MODE SHARED ) - set( LIB_MODE_DEFINITIONS -DPOCO_NO_AUTOMATIC_LIBS) + set(LIB_MODE SHARED) + set(LIB_MODE_DEFINITIONS -DPOCO_NO_AUTOMATIC_LIBS) message(STATUS "Building dynamic libraries") endif(POCO_STATIC) -if (ENABLE_TESTS) +if(ENABLE_TESTS) include(CTest) enable_testing() message(STATUS "Building with unittests & samples") -else () +else() message(STATUS "Building without tests & samples") -endif () +endif() -if (POCO_UNBUNDLED) - add_definitions( -DPOCO_UNBUNDLED) +if(POCO_UNBUNDLED) + add_definitions(-DPOCO_UNBUNDLED) message(STATUS "Build with using external sqlite, libz, pcre, expat ...") -else () +else() message(STATUS "Build with using internal copy of sqlite, libz, pcre, expat, ...") -endif () +endif() include(DefinePlatformSpecifc) # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file set(Poco_COMPONENTS "") -if (ENABLE_TESTS) +if(ENABLE_TESTS) add_subdirectory(CppUnit) -endif () +endif() add_subdirectory(Foundation) if(ENABLE_XML)