cvs: php4 /ext/pgsql config.m4 pgsql.c php_pgsql.h

jah Fri Jul 28 21:24:11 2000 EDT Modified files: /php4/ext/pgsql config.m4 pgsql.c php_pgsql.h Log: This should fix #5826. Index: php4/ext/pgsql/config.m4 diff -u php4/ext/pgsql/config.m4:1.15 php4/ext/pgsql/config.m4:1.16 --- php4/ext/pgsql/config.m4:1.15 Tue Jul 11 05:38:06 2000 +++ php4/ext/pgsql/config.m4 Fri Jul 28 21:24:11 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15 2000/07/11 12:38:06 sas Exp $ +dnl $Id: config.m4,v 1.16 2000/07/29 04:24:11 jah Exp $ AC_DEFUN(PGSQL_INC_CHK,[if test -r $i$1/libpq-fe.h; then PGSQL_DIR=$i; PGSQL_INCDIR=$i$1]) @@ -30,7 +30,8 @@ LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR" AC_CHECK_LIB(pq, PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES,1,[ ])) AC_CHECK_LIB(pq, PQoidValue,AC_DEFINE(HAVE_PQOIDVALUE,1,[ ])) - AC_CHECK_LIB(pq, pg_encoding_to_char,AC_DEFINE(HAVE_PQCLIENTENCODING,1,[ ])) + AC_CHECK_LIB(pq, PQclientEncoding,AC_DEFINE(HAVE_PQCLIENTENCODING,1,[ ])) + AC_CHECK_LIB(pq, pg_encoding_to_char,AC_DEFINE(HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT,1,[ ])) LIBS="$old_LIBS" LDFLAGS="$old_LDFLAGS" Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.64 php4/ext/pgsql/pgsql.c:1.65 --- php4/ext/pgsql/pgsql.c:1.64 Tue Jul 11 05:38:06 2000 +++ php4/ext/pgsql/pgsql.c Fri Jul 28 21:24:11 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.64 2000/07/11 12:38:06 sas Exp $ */ +/* $Id: pgsql.c,v 1.65 2000/07/29 04:24:11 jah Exp $ */ #include <stdlib.h> @@ -1664,6 +1664,12 @@ } ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL link", le_link, le_plink); + + /* Just do the same as found in PostgreSQL sources... */ + +#ifndef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT +#define pg_encoding_to_char(x) "SQL_ASCII" +#endif return_value->value.str.val = (char *) pg_encoding_to_char(PQclientEncoding(pgsql)); Index: php4/ext/pgsql/php_pgsql.h diff -u php4/ext/pgsql/php_pgsql.h:1.17 php4/ext/pgsql/php_pgsql.h:1.18 --- php4/ext/pgsql/php_pgsql.h:1.17 Sun Jul 2 16:46:45 2000 +++ php4/ext/pgsql/php_pgsql.h Fri Jul 28 21:24:11 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pgsql.h,v 1.17 2000/07/02 23:46:45 sas Exp $ */ +/* $Id: php_pgsql.h,v 1.18 2000/07/29 04:24:11 jah Exp $ */ #ifndef PHP_PGSQL_H #define PHP_PGSQL_H @@ -85,8 +85,10 @@ PHP_FUNCTION(pg_loreadall); PHP_FUNCTION(pg_loimport); PHP_FUNCTION(pg_loexport); +#if HAVE_PQCLIENTENCODING PHP_FUNCTION(pg_clientencoding); PHP_FUNCTION(pg_setclientencoding); +#endif void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent); int php_pgsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS);