From 2a5c403d63d48ece1571d8021b3ef576a2f16cd5 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 9 Apr 2013 15:18:26 +0200 Subject: [PATCH] Default timeout to 300 seconds. --- CMakeLists.txt | 2 +- CPackConfig.cmake | 2 +- modules/csync_owncloud.c | 2 +- src/csync.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dc2e02fae..46a049f953 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME}) set(APPLICATION_VERSION_MAJOR "0") set(APPLICATION_VERSION_MINOR "70") -set(APPLICATION_VERSION_PATCH "5") +set(APPLICATION_VERSION_PATCH "6") set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}") diff --git a/CPackConfig.cmake b/CPackConfig.cmake index 3756b8c2a2..6969b80b53 100644 --- a/CPackConfig.cmake +++ b/CPackConfig.cmake @@ -13,7 +13,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") ### versions set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR "70") -set(CPACK_PACKAGE_VERSION_PATCH "5") +set(CPACK_PACKAGE_VERSION_PATCH "6") set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_GENERATOR "TGZ") diff --git a/modules/csync_owncloud.c b/modules/csync_owncloud.c index 8374956500..9199575905 100644 --- a/modules/csync_owncloud.c +++ b/modules/csync_owncloud.c @@ -746,7 +746,7 @@ static int dav_connect(const char *base_url) { } if (dav_session.read_timeout == 0) - dav_session.read_timeout = 30; // Default from old code + dav_session.read_timeout = 300; // set 300 seconds as default. ne_set_read_timeout(dav_session.ctx, dav_session.read_timeout); diff --git a/src/csync.h b/src/csync.h index 3870262b63..af5c60a2e6 100644 --- a/src/csync.h +++ b/src/csync.h @@ -51,7 +51,7 @@ extern "C" { /* csync version */ #define LIBCSYNC_VERSION_MAJOR 0 #define LIBCSYNC_VERSION_MINOR 70 -#define LIBCSYNC_VERSION_MICRO 5 +#define LIBCSYNC_VERSION_MICRO 6 #define LIBCSYNC_VERSION_INT CSYNC_VERSION_INT(LIBCSYNC_VERSION_MAJOR, \ LIBCSYNC_VERSION_MINOR, \