From: Xinchen Hui <laruence@php.net>
Date: Sat, 5 May 2012 16:52:51 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0747b29bdf43be0682d10bdfc788f12f19ccf443;p=php

Merge branch 'PHP-5.3' into PHP-5.4

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

Conflicts:
	ext/curl/interface.c
---

0747b29bdf43be0682d10bdfc788f12f19ccf443