diff options
| author | Xinchen Hui <laruence@php.net> | 2012-03-22 17:17:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-03-22 17:17:42 +0800 |
| commit | 2dbced096a3c3bc88cb0017ec1c3c0ade19e7951 (patch) | |
| tree | 58cc403c2bf0f30f42615f907a0be838a22f7cdd /ext/soap/php_http.c | |
| parent | c0e9767131c01729f94c313850c11df127867225 (diff) | |
| parent | e96a172114dc6e491e265f3542c735b99e0ce557 (diff) | |
| download | php-git-2dbced096a3c3bc88cb0017ec1c3c0ade19e7951.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix test, which was broken by the fix for #61173
Conflicts:
ext/fileinfo/tests/finfo_open_error.phpt
Diffstat (limited to 'ext/soap/php_http.c')
0 files changed, 0 insertions, 0 deletions