diff options
| author | Xinchen Hui <laruence@php.net> | 2012-07-09 08:38:03 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-07-09 08:38:03 +0800 |
| commit | 0398cc22a9fda50ad9ba0fb2d717f07a711e1732 (patch) | |
| tree | 0fb346622b3813c73a943e219c2909cbc2c6fa15 /ext/reflection/php_reflection.c | |
| parent | 5910d8d4f499bf84bcaa1161bd0b89c15a19a304 (diff) | |
| parent | c819cf9d6bd43d79b894f1d0f0c6c282893fd9bd (diff) | |
| download | php-git-0398cc22a9fda50ad9ba0fb2d717f07a711e1732.tar.gz | |
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
Diffstat (limited to 'ext/reflection/php_reflection.c')
0 files changed, 0 insertions, 0 deletions