com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/opcache/Optimizer/optimiz e_func_calls.c ext/pgsql/pgsql.c
ext/pgsql/php_pg sql.h ext/session/mod_files.c ext/session/session.c

From: Date: Wed, 15 Jan 2014 07:29:12 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/opcache/Optimizer/optimiz e_func_calls.c ext/pgsql/pgsql.c
ext/pgsql/php_pg sql.h ext/session/mod_files.c ext/session/session.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75631@lists.php.net to get a copy of this message
Commit: 208e580ebcc499c85bac7a621509473b34c2c264 Author: Anatol Belski <ab@php.net> Wed, 15 Jan 2014 08:29:12 +0100 Parents: 3213959080208d8a48ee9572e304c05d7fdb3704 61028ad45ee3ccf779bdf497c5efcb274487fecd Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=208e580ebcc499c85bac7a621509473b34c2c264 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Conflicts: ext/pgsql/pgsql.c Changed paths: MM ext/opcache/Optimizer/optimize_func_calls.c MM ext/pgsql/pgsql.c MM ext/pgsql/php_pgsql.h MM ext/session/mod_files.c MM ext/session/session.c Diff: diff --cc ext/pgsql/pgsql.c index 4acd88d,20b281e...468a45f --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@@ -1509,20 -1511,32 +1519,32 @@@ static void php_pgsql_get_link_info(INT array_init(return_value); add_assoc_string(return_value, "client", PG_VERSION, 1); #if HAVE_PQPROTOCOLVERSION - add_assoc_long(return_value, "protocol", PQprotocolVersion(pgsql)); + add_assoc_int(return_value, "protocol", PQprotocolVersion(pgsql)); #if HAVE_PQPARAMETERSTATUS if (PQprotocolVersion(pgsql) >= 3) { + /* 8.0 or grater supports protorol version 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); + tmp = (char*)PQparameterStatus(pgsql, "server_encoding"); + add_assoc_string(return_value, "server_encoding", tmp, 1); + tmp = (char*)PQparameterStatus(pgsql, "client_encoding"); + add_assoc_string(return_value, "client_encoding", tmp, 1); + tmp = (char*)PQparameterStatus(pgsql, "is_superuser"); + add_assoc_string(return_value, "is_superuser", tmp, 1); + tmp = (char*)PQparameterStatus(pgsql, "session_authorization"); + add_assoc_string(return_value, "session_authorization", tmp, 1); + tmp = (char*)PQparameterStatus(pgsql, "DateStyle"); + add_assoc_string(return_value, "DateStyle", tmp, 1); + tmp = (char*)PQparameterStatus(pgsql, "IntervalStyle"); + add_assoc_string(return_value, "IntervalStyle", tmp ? tmp : "", 1); + tmp = (char*)PQparameterStatus(pgsql, "TimeZone"); + add_assoc_string(return_value, "TimeZone", tmp ? tmp : "", 1); + tmp = (char*)PQparameterStatus(pgsql, "integer_datetimes"); + add_assoc_string(return_value, "integer_datetimes", tmp ? tmp : "", 1); + tmp = (char*)PQparameterStatus(pgsql, "standard_conforming_strings"); + add_assoc_string(return_value, "standard_conforming_strings", tmp ? tmp : "", 1); + tmp = (char*)PQparameterStatus(pgsql, "application_name"); + add_assoc_string(return_value, "application_name", tmp ? tmp : "", 1); } #endif #endif @@@ -3625,7 -3624,7 +3647,7 @@@ PHP_FUNCTION(pg_lo_export PHP_FUNCTION(pg_lo_seek) { zval *pgsql_id = NULL; - php_int_t offset = 0, whence = SEEK_CUR; - long result, offset = 0, whence = SEEK_CUR; ++ php_int_t result, offset = 0, whence = SEEK_CUR; pgLofp *pgsql; int argc = ZEND_NUM_ARGS(); @@@ -3662,8 -3670,16 +3693,16 @@@ PHP_FUNCTION(pg_lo_tell ZEND_FETCH_RESOURCE(pgsql, pgLofp *, &pgsql_id, -1, "PostgreSQL large object", le_lofp); + #if HAVE_PG_LO64 + if (PQserverVersion((PGconn *)pgsql->conn) >= 90300) { + offset = lo_tell64((PGconn *)pgsql->conn, pgsql->lofd); + } else { + offset = lo_tell((PGconn *)pgsql->conn, pgsql->lofd); + } + #else offset = lo_tell((PGconn *)pgsql->conn, pgsql->lofd); + #endif - RETURN_LONG(offset); + RETURN_INT(offset); } /* }}} */

« previous php.cvs (#75631) next »