diff options
author | Anatol Belski <ab@php.net> | 2016-03-02 17:06:03 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2016-03-02 17:06:03 +0100 |
commit | de3e033010d624ea22aa38211bb854f17762362c (patch) | |
tree | e0485d57360567ede7d5c8145e3de5747935c02e | |
parent | c67c166f930b2f815a805a3376e9244794e20c31 (diff) | |
parent | 4f0042beadd3141c901ae5a0ef1cf1a6d29656be (diff) | |
download | php-git-de3e033010d624ea22aa38211bb854f17762362c.tar.gz |
Merge branch 'PHP-7.0'
* PHP-7.0:
show correct MINFO with libpq >= 9.5.x
-rw-r--r-- | ext/pgsql/pgsql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 34ae0d02f7..b59f5a6e5b 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1258,7 +1258,7 @@ PHP_MINFO_FUNCTION(pgsql) #else php_info_print_table_row(2, "Multibyte character support", "disabled"); #endif -#ifdef USE_SSL +#if defined(USE_SSL) || defined(USE_OPENSSL) php_info_print_table_row(2, "SSL support", "enabled"); #else php_info_print_table_row(2, "SSL support", "disabled"); |