From: Xinchen Hui <laruence@php.net>
Date: Sat, 5 May 2012 16:53:47 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~232^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71e7c854b15db08c7bd9355791f859b5cea6e490;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
---

71e7c854b15db08c7bd9355791f859b5cea6e490