From 0f37484b8a708dacba99697cf5bb17e1b2b6d5e2 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 28 Jul 2014 11:44:10 +0200 Subject: [PATCH 1/4] Bumped the release number to 1.6.2, Changelog additions. --- ChangeLog | 3 ++- VERSION.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fad220ba7..7722eff81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ ChangeLog ========= -version 1.6.2 (release 2014-07-x ) +version 1.6.2 (release 2014-07-28 ) + * Limit the HTTP buffer size when downloading to limit memory consumption. * Another small mem leak fixed in HTTP Credentials. * Fix local file name clash detection for MacOSX. * Limit maximum wait time to ten seconds in network limiting. diff --git a/VERSION.cmake b/VERSION.cmake index f91d404e4..b2fa967dd 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 2 ) set( MIRALL_SOVERSION 0 ) if ( NOT DEFINED MIRALL_VERSION_SUFFIX ) - set( MIRALL_VERSION_SUFFIX "rc2") #e.g. beta1, beta2, rc1 + set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1 endif( NOT DEFINED MIRALL_VERSION_SUFFIX ) if( NOT DEFINED MIRALL_VERSION_BUILD ) From 5254c9785ccef15e6b619220b9b467de5f3a97e6 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 28 Jul 2014 13:50:24 +0200 Subject: [PATCH 2/4] shibboleth: Fix connection when the URL do not have a path When the url do not have a path (for example: "http://example.com" as opposed to "http://example.com/"), its path is not a prefix of the root path of the cookie (usually '/') By adding the dav path, we make sure the URL has a path. This made a bug when the owncloud url was just a domain name and did not have a path --- src/creds/shibbolethcredentials.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp index 5b83f701f..e3ad80b47 100644 --- a/src/creds/shibbolethcredentials.cpp +++ b/src/creds/shibbolethcredentials.cpp @@ -405,7 +405,7 @@ void ShibbolethCredentials::showLoginWindow(Account* account) QList ShibbolethCredentials::accountCookies(Account *account) { - return account->networkAccessManager()->cookieJar()->cookiesForUrl(account->url()); + return account->networkAccessManager()->cookieJar()->cookiesForUrl(account->davUrl()); } QNetworkCookie ShibbolethCredentials::findShibCookie(Account *account, QList cookies) From 0c9d57228d9e7adb30bf6c06ad09f02c8dd2782d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Tue, 29 Jul 2014 18:29:55 +0200 Subject: [PATCH 3/4] Fix issue#2004 -- mandir must be man1, not man --- doc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index cf12765de..dbca98a7d 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -4,7 +4,7 @@ if(SPHINX_FOUND) set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees") # HTML output directory set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html") - set(SPHINX_MAN_DIR "${CMAKE_CURRENT_BINARY_DIR}/man") + set(SPHINX_MAN_DIR "${CMAKE_CURRENT_BINARY_DIR}/man1") set(SPHINX_PDF_DIR "${CMAKE_CURRENT_BINARY_DIR}/latex") set(SPHINX_QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/qthelp") set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp") From cfdfd6a8601445f2eb29a392c1be65c4e1122c4b Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 30 Jul 2014 12:18:55 +0200 Subject: [PATCH 4/4] wizard: don't call initializePage It is called automatically by QWizard and do not need to be called explicitly But setVisibla(false) don't really have an effect there since show() is going to be called on the page --- src/wizard/owncloudsetuppage.cpp | 6 +++++- src/wizard/owncloudwizard.cpp | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wizard/owncloudsetuppage.cpp b/src/wizard/owncloudsetuppage.cpp index 06cfbe6e0..e84d6dd3e 100644 --- a/src/wizard/owncloudsetuppage.cpp +++ b/src/wizard/owncloudsetuppage.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -145,9 +146,12 @@ void OwncloudSetupPage::initializePage() if (Theme::instance()->overrideServerUrl().isEmpty()) { _ui.leUrl->setFocus(); } else { - setVisible(false); setCommitPage(true); validatePage(); + setVisible(false); + // because the wizard will call show on us right after this call, we need to hide in the + // next event loop iteration. + QTimer::singleShot(0, this, SLOT(hide())); } } diff --git a/src/wizard/owncloudwizard.cpp b/src/wizard/owncloudwizard.cpp index 94e3559ca..4ee870d3d 100644 --- a/src/wizard/owncloudwizard.cpp +++ b/src/wizard/owncloudwizard.cpp @@ -161,7 +161,6 @@ void OwncloudWizard::slotCurrentPageChanged( int id ) if( id == WizardCommon::Page_ServerSetup ) { emit clearPendingRequests(); - _setupPage->initializePage(); } if( id == WizardCommon::Page_Result ) {