php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 17:43:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  Fixed pg_version() crash with older postgresql
This commit is contained in:
Yasuo Ohgaki
2014-01-15 13:32:43 +09:00
parent 42c134df4b d0924c2500
commit ee4e5ce2cf
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ext/pgsql/pgsql.c
View File

@@ -1504,17 +1504,38 @@ static void php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type
add_assoc_long(return_value, "protocol", PQprotocolVersion(pgsql));
#if HAVE_PQPARAMETERSTATUS
if (PQprotocolVersion(pgsql) >= 3) {
char *tmp;
add_assoc_string(return_value, "server", (char*)PQparameterStatus(pgsql, "server_version"), 1);
add_assoc_string(return_value, "server_encoding", (char*)PQparameterStatus(pgsql, "server_encoding"), 1);
add_assoc_string(return_value, "application_name", (char*)PQparameterStatus(pgsql, "application_name"), 1);
add_assoc_string(return_value, "is_superuser", (char*)PQparameterStatus(pgsql, "is_superuser"), 1);
add_assoc_string(return_value, "session_authorization", (char*)PQparameterStatus(pgsql, "session_authorization"), 1);
add_assoc_string(return_value, "DateStyle", (char*)PQparameterStatus(pgsql, "DateStyle"), 1);
add_assoc_string(return_value, "IntervalStyle", (char*)PQparameterStatus(pgsql, "IntervalStyle"), 1);
add_assoc_string(return_value, "TimeZone", (char*)PQparameterStatus(pgsql, "TimeZone"), 1);
add_assoc_string(return_value, "integer_datetimes", (char*)PQparameterStatus(pgsql, "integer_datetimes"), 1);
add_assoc_string(return_value, "standard_conforming_strings", (char*)PQparameterStatus(pgsql, "standard_conforming_strings"), 1);
add_assoc_string(return_value, "server_encoding", (char*)PQparameterStatus(pgsql, "server_encoding"), 1);
if ((tmp = (char*)PQparameterStatus(pgsql, "server_encoding"))) {
add_assoc_string(return_value, "server_encoding", tmp, 1);
}
if ((tmp = (char*)PQparameterStatus(pgsql, "application_name"))) {
add_assoc_string(return_value, "application_name", tmp, 1);
}
if ((tmp = (char*)PQparameterStatus(pgsql, "is_superuser"))) {
add_assoc_string(return_value, "is_superuser", tmp, 1);
}
if ((tmp = (char*)PQparameterStatus(pgsql, "session_authorization"))) {
add_assoc_string(return_value, "session_authorization", tmp, 1);
}
if ((tmp = (char*)PQparameterStatus(pgsql, "DateStyle"))) {
add_assoc_string(return_value, "DateStyle", tmp, 1);
}
if ((tmp = (char*)PQparameterStatus(pgsql, "IntervalStyle"))) {
add_assoc_string(return_value, "IntervalStyle", tmp, 1);
}
if ((tmp = (char*)PQparameterStatus(pgsql, "TimeZone"))) {
add_assoc_string(return_value, "TimeZone", tmp, 1);
}
if ((tmp = (char*)PQparameterStatus(pgsql, "integer_datetimes"))) {
add_assoc_string(return_value, "integer_datetimes", tmp, 1);
}
if ((tmp = (char*)PQparameterStatus(pgsql, "standard_conforming_strings"))) {
add_assoc_string(return_value, "standard_conforming_strings", tmp, 1);
}
if ((tmp = (char*)PQparameterStatus(pgsql, "server_encoding"))) {
add_assoc_string(return_value, "server_encoding", tmp, 1);
}
}
#endif
#endif