Skip to content

Commit b3a6ca9

Browse files
committed
Fix 77264: curl_getinfo returning microseconds, not seconds
Since curl 7.55.0, libcurl introduced new constants to return more sensible variable types with curl_getinfo. When curl_getinfo with no option was called, and curl >= 7.55.0, some of the result were returned as int when they where returned as float in previous versions. This commit remove this BC Break. If someone still want to use more sensible variable types, it's always possible to call curl_getinfo with newer constants. CURLINFO_CONTENT_LENGTH_DOWNLOAD => CURLINFO_CONTENT_LENGTH_DOWNLOAD_T CURLINFO_CONTENT_LENGTH_UPLOAD => CURLINFO_CONTENT_LENGTH_UPLOAD_T CURLINFO_SIZE_DOWNLOAD => CURLINFO_SIZE_DOWNLOAD_T CURLINFO_SIZE_UPLOAD => CURLINFO_SIZE_UPLOAD_T CURLINFO_SPEED_DOWNLOAD => CURLINFO_SPEED_DOWNLOAD_T CURLINFO_SPEED_UPLOAD => CURLINFO_SPEED_UPLOAD_T CURLINFO_APPCONNECT_TIME => CURLINFO_APPCONNECT_TIME_T CURLINFO_CONNECT_TIME => CURLINFO_CONNECT_TIME_T CURLINFO_NAMELOOKUP_TIME => CURLINFO_NAMELOOKUP_TIME_T CURLINFO_PRETRANSFER_TIME => CURLINFO_PRETRANSFER_TIME_T CURLINFO_REDIRECT_TIME => CURLINFO_REDIRECT_TIME_T CURLINFO_STARTTRANSFER_TIME => CURLINFO_STARTTRANSFER_TIME_T CURLINFO_TOTAL_TIME => CURLINFO_TOTAL_TIME_T
1 parent cb3a1df commit b3a6ca9

File tree

2 files changed

+11
-32
lines changed

2 files changed

+11
-32
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ PHP NEWS
88
. Fixed bug #76046 (PHP generates "FE_FREE" opcode on the wrong line).
99
(Nikita)
1010

11+
- CURL:
12+
. Fixed bug #77264 (curl_getinfo returning microseconds, not seconds).
13+
(Pierrick)
14+
1115
- COM:
1216
. Fixed bug #77177 (Serializing or unserializing COM objects crashes). (cmb)
1317

ext/curl/interface.c

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3294,52 +3294,27 @@ PHP_FUNCTION(curl_getinfo)
32943294
CAAS("scheme", s_code);
32953295
}
32963296
#endif
3297-
#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
3298-
if (curl_easy_getinfo(ch->cp, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &co) == CURLE_OK) {
3299-
CAAL("content_length_download", co);
3300-
}
3301-
if (curl_easy_getinfo(ch->cp, CURLINFO_CONTENT_LENGTH_UPLOAD_T, &co) == CURLE_OK) {
3302-
CAAL("content_length_upload", co);
3303-
}
3304-
if (curl_easy_getinfo(ch->cp, CURLINFO_SIZE_DOWNLOAD_T, &co) == CURLE_OK) {
3305-
CAAL("size_download", co);
3306-
}
3307-
if (curl_easy_getinfo(ch->cp, CURLINFO_SIZE_UPLOAD_T, &co) == CURLE_OK) {
3308-
CAAL("size_upload", co);
3309-
}
3310-
if (curl_easy_getinfo(ch->cp, CURLINFO_SPEED_DOWNLOAD_T, &co) == CURLE_OK) {
3311-
CAAL("speed_download", co);
3312-
}
3313-
if (curl_easy_getinfo(ch->cp, CURLINFO_SPEED_UPLOAD_T, &co) == CURLE_OK) {
3314-
CAAL("speed_upload", co);
3315-
}
3316-
#endif
3317-
#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
3318-
if (curl_easy_getinfo(ch->cp, CURLINFO_FILETIME_T, &co) == CURLE_OK) {
3319-
CAAL("filetime", co);
3320-
}
3321-
#endif
33223297
#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
33233298
if (curl_easy_getinfo(ch->cp, CURLINFO_APPCONNECT_TIME_T, &co) == CURLE_OK) {
3324-
CAAL("appconnect_time", co);
3299+
CAAL("appconnect_time_us", co);
33253300
}
33263301
if (curl_easy_getinfo(ch->cp, CURLINFO_CONNECT_TIME_T, &co) == CURLE_OK) {
3327-
CAAL("connect_time", co);
3302+
CAAL("connect_time_us", co);
33283303
}
33293304
if (curl_easy_getinfo(ch->cp, CURLINFO_NAMELOOKUP_TIME_T, &co) == CURLE_OK) {
3330-
CAAL("namelookup_time", co);
3305+
CAAL("namelookup_time_us", co);
33313306
}
33323307
if (curl_easy_getinfo(ch->cp, CURLINFO_PRETRANSFER_TIME_T, &co) == CURLE_OK) {
3333-
CAAL("pretransfer_time", co);
3308+
CAAL("pretransfer_time_us", co);
33343309
}
33353310
if (curl_easy_getinfo(ch->cp, CURLINFO_REDIRECT_TIME_T, &co) == CURLE_OK) {
3336-
CAAL("redirect_time", co);
3311+
CAAL("redirect_time_us", co);
33373312
}
33383313
if (curl_easy_getinfo(ch->cp, CURLINFO_STARTTRANSFER_TIME_T, &co) == CURLE_OK) {
3339-
CAAL("starttransfer_time", co);
3314+
CAAL("starttransfer_time_us", co);
33403315
}
33413316
if (curl_easy_getinfo(ch->cp, CURLINFO_TOTAL_TIME_T, &co) == CURLE_OK) {
3342-
CAAL("total_time", co);
3317+
CAAL("total_time_us", co);
33433318
}
33443319
#endif
33453320
if (ch->header.str) {

0 commit comments

Comments
 (0)