]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19632ae 4632fe0)
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sat, 5 May 2012 16:52:51 +0000 (00:52 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 5 May 2012 16:52:51 +0000 (00:52 +0800)
* PHP-5.3:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

Conflicts:
ext/curl/interface.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.