Skip to content

Commit 4f0042b

Browse files
committed
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: show correct MINFO with libpq >= 9.5.x
2 parents 908b662 + 2399c64 commit 4f0042b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ext/pgsql/pgsql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ PHP_MINFO_FUNCTION(pgsql)
12521252
#else
12531253
php_info_print_table_row(2, "Multibyte character support", "disabled");
12541254
#endif
1255-
#ifdef USE_SSL
1255+
#if defined(USE_SSL) || defined(USE_OPENSSL)
12561256
php_info_print_table_row(2, "SSL support", "enabled");
12571257
#else
12581258
php_info_print_table_row(2, "SSL support", "disabled");

0 commit comments

Comments
 (0)