From: Christopher Jones <sixd@php.net>
Date: Wed, 11 Sep 2013 12:41:00 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~211^2~51^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f34e9fcd5feb89f0c4732db7598fdcfcdc5f3b88;p=php

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
---

f34e9fcd5feb89f0c4732db7598fdcfcdc5f3b88