cvs: php4 /ext/oci8 oci8.c
| From: | Thies C. Arntzen | Date: | Sat, 05 Aug 2000 10:07:39 +0000 |
| Subject: | cvs: php4 /ext/oci8 oci8.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1045@lists.php.net to get a copy of this message | ||
thies Sat Aug 5 03:07:39 2000 EDT
Modified files:
/php4/ext/oci8 oci8.c
Log:
@- OCIError() would sometimes not report failed connections. (Thies)
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.90 php4/ext/oci8/oci8.c:1.91
--- php4/ext/oci8/oci8.c:1.90 Sat Jul 15 07:54:04 2000
+++ php4/ext/oci8/oci8.c Sat Aug 5 03:07:39 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.90 2000/07/15 14:54:04 thies Exp $ */
+/* $Id: oci8.c,v 1.91 2000/08/05 10:07:39 thies Exp $ */
/* TODO list:
*
@@ -2163,14 +2163,16 @@
_oci_close_server(oci_server *server)
{
char *dbname;
+ int oldopen;
OCILS_FETCH();
ELS_FETCH();
+ oldopen = server->open;
server->open = 2;
-
if (! OCI(shutdown)) {
zend_hash_apply(&EG(regular_list),_oci_session_cleanup);
}
+ server->open = oldopen;
oci_debug("START _oci_close_server: detaching conn=%d
dbname=%s",server->num,server->dbname);
@@ -2178,19 +2180,11 @@
if (server->open) {
if (server->pServer && OCI(pError)) {
-#if 0 && APACHE
- void (*handler) (int);
- handler = signal(SIGCHLD, SIG_DFL);
-#endif
OCI(error) =
OCIServerDetach(server->pServer,
OCI(pError),
OCI_DEFAULT);
-#if 0 && APACHE
- signal(SIGCHLD,handler);
-#endif
-
if (OCI(error)) {
oci_error(OCI(pError), "oci_close_server OCIServerDetach", OCI(error));
}