diff --git a/CMakeLists.txt b/CMakeLists.txt index b7611212..7ae2ddaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE ) # make sure to change the version in docs/Makefile set (MUJINCLIENT_VERSION_MAJOR 0) set (MUJINCLIENT_VERSION_MINOR 48) -set (MUJINCLIENT_VERSION_PATCH 0) +set (MUJINCLIENT_VERSION_PATCH 1) set (MUJINCLIENT_VERSION ${MUJINCLIENT_VERSION_MAJOR}.${MUJINCLIENT_VERSION_MINOR}.${MUJINCLIENT_VERSION_PATCH}) set (MUJINCLIENT_SOVERSION ${MUJINCLIENT_VERSION_MAJOR}.${MUJINCLIENT_VERSION_MINOR}) set (CLIENT_SOVERSION ${MUJINCLIENT_VERSION_MAJOR}.${MUJINCLIENT_VERSION_MINOR}) diff --git a/src/controllerclientimpl.cpp b/src/controllerclientimpl.cpp index 1ac8e47b..de7fc0c0 100644 --- a/src/controllerclientimpl.cpp +++ b/src/controllerclientimpl.cpp @@ -187,6 +187,13 @@ ControllerClientImpl::ControllerClientImpl(const std::string& usernamepassword, CURL_OPTION_SETTER(_curl, CURLOPT_POSTFIELDSIZE, 0L); CURL_OPTION_SETTER(_curl, CURLOPT_POSTFIELDS, NULL); + { + curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW); + if(ver->features & CURL_VERSION_LIBZ) { + CURL_OPTION_SETTER(_curl, CURLOPT_ACCEPT_ENCODING, "gzip, deflate"); + } + } + // csrftoken can be any non-empty string _csrfmiddlewaretoken = "csrftoken"; std::string cookie = "Set-Cookie: csrftoken=" + _csrfmiddlewaretoken; @@ -974,8 +981,6 @@ void ControllerClientImpl::_SetupHTTPHeadersJSON() _httpheadersjson = curl_slist_append(_httpheadersjson, s.c_str()); _httpheadersjson = curl_slist_append(_httpheadersjson, "Connection: Keep-Alive"); _httpheadersjson = curl_slist_append(_httpheadersjson, "Keep-Alive: 20"); // keep alive for 20s? - // test on windows first - //_httpheadersjson = curl_slist_append(_httpheadersjson, "Accept-Encoding: gzip, deflate"); } void ControllerClientImpl::_SetupHTTPHeadersSTL()