@@ -272,9 +272,10 @@ PHP_MINFO_FUNCTION(curl)
272
272
d = curl_version_info (CURLVERSION_NOW );
273
273
php_info_print_table_start ();
274
274
php_info_print_table_row (2 , "cURL support" , "enabled" );
275
- php_info_print_table_row (2 , "cURL Information " , d -> version );
275
+ php_info_print_table_row (2 , "cURL version " , d -> version );
276
276
snprintf (str , sizeof (str ), "%d" , d -> age );
277
277
php_info_print_table_row (2 , "Age" , str );
278
+ php_info_print_table_row (2 , "Host" , d -> host );
278
279
279
280
// Features
280
281
if (d -> age >= CURLVERSION_ELEVENTH && d -> feature_names ) {
@@ -352,6 +353,7 @@ PHP_MINFO_FUNCTION(curl)
352
353
}
353
354
}
354
355
356
+ // Protocols
355
357
n = 0 ;
356
358
p = (char * * ) d -> protocols ;
357
359
while (* p != NULL ) {
@@ -360,8 +362,7 @@ PHP_MINFO_FUNCTION(curl)
360
362
}
361
363
php_info_print_table_row (2 , "Protocols" , str );
362
364
363
- php_info_print_table_row (2 , "Host" , d -> host );
364
-
365
+ // SSL
365
366
if (d -> ssl_version ) {
366
367
php_info_print_table_row (2 , "SSL Version" , d -> ssl_version );
367
368
}
@@ -374,13 +375,14 @@ PHP_MINFO_FUNCTION(curl)
374
375
}
375
376
php_info_print_table_row (2 , "SSL backends" , str );
376
377
378
+ // Feature versions
377
379
if (d -> libz_version ) {
378
- php_info_print_table_row (2 , "ZLib Version" , d -> libz_version );
380
+ php_info_print_table_row (2 , "Zlib Version" , d -> libz_version );
379
381
}
380
382
381
383
#if defined(CURLVERSION_SECOND ) && CURLVERSION_NOW >= CURLVERSION_SECOND
382
384
if (d -> ares ) {
383
- php_info_print_table_row (2 , "ZLib Version" , d -> ares );
385
+ php_info_print_table_row (2 , "c-ares Version" , d -> ares );
384
386
}
385
387
#endif
386
388
@@ -1053,6 +1055,7 @@ PHP_FUNCTION(curl_version)
1053
1055
1054
1056
CAAL ("version_number" , d -> version_num );
1055
1057
CAAL ("age" , d -> age );
1058
+ CAAS ("host" , d -> host );
1056
1059
1057
1060
/* Add an array of features */
1058
1061
zval feature_list ;
@@ -1130,7 +1133,6 @@ PHP_FUNCTION(curl_version)
1130
1133
CAAZ ("features" , & feature_list );
1131
1134
CAAL ("ssl_version_number" , d -> ssl_version_num );
1132
1135
CAAS ("version" , d -> version );
1133
- CAAS ("host" , d -> host );
1134
1136
CAAS ("ssl_version" , d -> ssl_version );
1135
1137
CAAS ("libz_version" , d -> libz_version );
1136
1138
/* Add an array of protocols */
0 commit comments