cvs: php4(PHP_4_2_0) /ext/oci8 oci8.c

thies Sat Apr 13 08:14:02 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/oci8 oci8.c Log: MFH: Mixing OCIPlogon and OCINLogon no longer leak Oracle-Sessions. (thies) to RM: this is a real fix that _should_ be in 4.2! Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.169 php4/ext/oci8/oci8.c:1.169.2.1 --- php4/ext/oci8/oci8.c:1.169 Thu Feb 28 03:26:28 2002 +++ php4/ext/oci8/oci8.c Sat Apr 13 08:14:02 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.169 2002/02/28 08:26:28 sebastian Exp $ */ +/* $Id: oci8.c,v 1.169.2.1 2002/04/13 12:14:02 thies Exp $ */ /* TODO list: * @@ -631,7 +631,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.169 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.169.2.1 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -2578,7 +2578,13 @@ goto CLEANUP; } - persistent = server->persistent; /* if our server-context is not persistent we can't */ + if (exclusive) { + /* exlusive session can never be persistent!*/ + persistent = 0; + } else { + /* if our server-context is not persistent we can't */ + persistent = server->persistent; + } session = _oci_open_session(server,username,password,persistent,exclusive);