diff options
| author | Anatol Belski <ab@php.net> | 2016-03-02 17:05:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-03-02 17:05:05 +0100 |
| commit | 4f0042beadd3141c901ae5a0ef1cf1a6d29656be (patch) | |
| tree | f6c9e5a634fe73cb482e03643952a2e8b6c64b38 | |
| parent | 908b662f7fcfbc032f70ece82c25fdc8d21de4b3 (diff) | |
| parent | 2399c64eaffba559332b54b664b670c46ac471c2 (diff) | |
| download | php-git-4f0042beadd3141c901ae5a0ef1cf1a6d29656be.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
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 f84f31aed6..82cefe36c6 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1252,7 +1252,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"); |