diff options
| author | Xinchen Hui <laruence@php.net> | 2012-05-06 00:52:51 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-05-06 00:52:51 +0800 |
| commit | 0747b29bdf43be0682d10bdfc788f12f19ccf443 (patch) | |
| tree | 4f10124872b23046b598860a524591474124accc /main/streams/streams.c | |
| parent | 19632ae7dcdbbb7c34bf0ffde9fb7858f55424cd (diff) | |
| parent | 4632fe0eefb749da5c6bfdf22beaf2ffa80c3a56 (diff) | |
| download | php-git-0747b29bdf43be0682d10bdfc788f12f19ccf443.tar.gz | |
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
Diffstat (limited to 'main/streams/streams.c')
0 files changed, 0 insertions, 0 deletions