[commits] Horde branch develop updated. 8bc80fc9d9fb65e569c16d653821549890caa858

[Michael M Slusarz]

The branch "develop" has been updated.
The following is a summary of the commits.

from: 1978a223f7edbbda63ff46f9672e9017e49d7739

7f1c7ca We need both of these checks (Bug #11143)
f458c3b Better fix for Bug #11143
e0ac9f6 Merge branch 'master' into develop
d586204 Default authentication failure should not be session timeout
8bc80fc Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop

-----------------------------------------------------------------------

commit 7f1c7ca00c593c64a35ba1ee5ac57b31d37e254f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 13 09:35:51 2012 -0600

    We need both of these checks (Bug #11143)

 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/7f1c7ca00c593c64a35ba1ee5ac57b31d37e254f

-----------------------------------------------------------------------

commit f458c3b2482e0b1d8ce6a96d9fa5e24622401961
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 13 10:30:43 2012 -0600

    Better fix for Bug #11143

 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/f458c3b2482e0b1d8ce6a96d9fa5e24622401961

-----------------------------------------------------------------------

commit e0ac9f641bf1c73028652d010d9a8831dbb4bd44
Merge: a4cf445 f458c3b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 13 11:08:14 2012 -0600

    Merge branch 'master' into develop

 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/e0ac9f641bf1c73028652d010d9a8831dbb4bd44

-----------------------------------------------------------------------

commit d58620458bb2971216762407f59a5a3c3a5f7e71
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 13 11:35:13 2012 -0600

    Default authentication failure should not be session timeout
    
    Otherwise, every first access to a page will show a session timeout
    error. We can only show the session timeout error when we have at least
    some proof that the user had recently had an active session.

 framework/Core/lib/Horde/Exception/AuthenticationFailure.php |    4 ++--
 horde/services/ajax.php                                      |    5 +----
 imp/lib/Factory/Imap.php                                     |    2 +-
 imp/lib/Imap.php                                             |    2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/d58620458bb2971216762407f59a5a3c3a5f7e71

-----------------------------------------------------------------------

commit 8bc80fc9d9fb65e569c16d653821549890caa858
Merge: d586204 1978a22
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 13 11:37:55 2012 -0600

    Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/8bc80fc9d9fb65e569c16d653821549890caa858