[Pkg-owncloud-commits] [owncloud] 23/34: Merge pull request #11248 from owncloud/11032-backport-stable6

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v6.0.6
in repository owncloud.

commit 870dc981aa302567f0be39d778460e01da926809
Merge: 784931f b2798af
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Thu Oct 16 13:54:21 2014 +0200

    Merge pull request #11248 from owncloud/11032-backport-stable6
    
    Do only follow HTTP and HTTPS redirects

 apps/files/ajax/newfile.php     |  10 ++-
 lib/private/httphelper.php      | 177 ++++++++++++++++++++++++++++++++++++++++
 lib/private/server.php          |  13 +++
 lib/private/user/http.php       |   2 +
 lib/private/util.php            |  51 ++----------
 lib/public/iservercontainer.php |   5 ++
 tests/lib/httphelper.php        |  88 ++++++++++++++++++++
 7 files changed, 298 insertions(+), 48 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git