diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-03 14:22:59 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-03 14:22:59 +0200 |
| commit | 827c446b62ecab6e92b93a9184ba28e581b4d882 (patch) | |
| tree | 74773f56b083c2f39f14b48b9055177632505f5e /ext/soap/php_http.c | |
| parent | 2a8866ba5ed28af456f5f8f396323bfbafe506be (diff) | |
| parent | 438536e45e1f762fd0f0fe7d9243adb63074e55d (diff) | |
| download | php-git-827c446b62ecab6e92b93a9184ba28e581b4d882.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61460 popen_close_error-win32 expected output is wrong
Conflicts:
ext/standard/tests/file/popen_pclose_error-win32.phpt
Diffstat (limited to 'ext/soap/php_http.c')
0 files changed, 0 insertions, 0 deletions