diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-07-13 22:39:12 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-07-13 22:39:12 +0200 |
| commit | cdf4d35e30709ec30a857b218d2669c98ffe1d25 (patch) | |
| tree | ef9ddd2f7465817e305b7a3c95165c63fa27ebc5 /ext/curl/interface.c | |
| parent | 36439cf7b8b00249f8f90be9dabe1e24bbadf7a1 (diff) | |
| parent | e9eee7684068252f6cdea8b0aa9ab9f37e04c617 (diff) | |
| download | php-git-cdf4d35e30709ec30a857b218d2669c98ffe1d25.tar.gz | |
Merge branch 'master' of http://git.php.net/repository/php-src
# By Christoph M. Becker (6) and others
* 'master' of http://git.php.net/repository/php-src:
updated NEWS
updated NEWS
Fix #66882: imagerotate by -90 degrees truncates image by 1px
update NEWS
Fixed bug #70065 curl_getinfo() returns corrupted values
Revert SplFileInfo BC break while keeping fix for assertion removal
Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character
updated NEWS
updated NEWS
Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 676c6adb81..f45d9d1d64 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2904,7 +2904,14 @@ PHP_FUNCTION(curl_getinfo) if (ZEND_NUM_ARGS() < 2) { char *s_code; +#ifdef PHP_WIN32 + /* libcurl currently relies on 32-bit long directly. + We should use zend_long here once libcurl has full + 64-bit support on Windows. */ + long l_code; +#else zend_long l_code; +#endif double d_code; #if LIBCURL_VERSION_NUM > 0x071301 struct curl_certinfo *ci = NULL; |