From: Thies C. Arntzen <thies@php.net>
Date: Sat, 5 Aug 2000 10:07:39 +0000 (+0000)
Subject: @- OCIError() would sometimes not report failed connections. (Thies)
X-Git-Tag: PRE_FILE_COMPILE_API_CHANGE~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34dfe582ff740c207da14afdc18c678a102e578e;p=php

@- OCIError() would sometimes not report failed connections. (Thies)
---

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 56b91fb717..739da224e7 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2163,14 +2163,16 @@ static void
 _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 @@ _oci_close_server(oci_server *server)
 
 	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));
 			}