diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-04-28 22:28:13 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-04-28 22:28:13 -0700 |
| commit | 8a51bdd3cebf4bb2f49090560da918f70a535ade (patch) | |
| tree | 84f56fbf110f398d58615767e5b9743321132db6 /ext/soap/php_http.c | |
| parent | 86685aefabb70a3c24d1aedd8551019ebf24ed3b (diff) | |
| parent | 4e773c1b92c5db328fbbca36e566a1c76957be63 (diff) | |
| download | php-git-8a51bdd3cebf4bb2f49090560da918f70a535ade.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert "Add CURL_WRAPPERS_ENABLE constant"
Conflicts:
ext/curl/interface.c
Diffstat (limited to 'ext/soap/php_http.c')
0 files changed, 0 insertions, 0 deletions