projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5910d8d c819cf9)
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Mon, 9 Jul 2012 00:38:03 +0000 (08:38 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 9 Jul 2012 00:38:03 +0000 (08:38 +0800)
commit0398cc22a9fda50ad9ba0fb2d717f07a711e1732
tree0fb346622b3813c73a943e219c2909cbc2c6fa15tree | snapshot
parent5910d8d4f499bf84bcaa1161bd0b89c15a19a304commit | diff
parentc819cf9d6bd43d79b894f1d0f0c6c282893fd9bdcommit | diff
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)

Conflicts:
ext/curl/interface.c
ext/curl/interface.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.