cvs: /php4/ext/oci8 oci8.c
| From: | Thies C. Arntzen | Date: | Fri, 12 Nov 1999 14:31:33 +0000 |
| Subject: | cvs: /php4/ext/oci8 oci8.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-6149@lists.php.net to get a copy of this message | ||
thies Fri Nov 12 09:31:33 1999 EDT
Modified files:
/php4/ext/oci8 oci8.c
Log:
fixed mested-tables again (broke it when resourcified the driver)
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.35 php4/ext/oci8/oci8.c:1.36
--- php4/ext/oci8/oci8.c:1.35 Wed Nov 10 00:50:20 1999
+++ php4/ext/oci8/oci8.c Fri Nov 12 09:31:01 1999
@@ -22,7 +22,7 @@
#define OCI_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */
-/* $Id: oci8.c,v 1.35 1999/11/10 05:50:20 rasmus Exp $ */
+/* $Id: oci8.c,v 1.36 1999/11/12 14:31:01 thies Exp $ */
/* TODO list:
*
@@ -816,8 +816,9 @@
}
if (column->is_cursor) { /* REFCURSOR -> simply return the statement id */
- value->type = IS_LONG;
+ value->type = IS_RESOURCE;
value->value.lval = column->stmtid;
+ zend_list_addref(column->stmtid);
} else if (column->is_descr) {
if ((column->data_type != SQLT_RDD) && (mode & OCI_RETURN_LOBS)) {
/* OCI_RETURN_LOBS means that we want the content of the LOB back instead of the locator */
@@ -1996,10 +1997,18 @@
if (server->open) {
if (server->pServer && OCI(pError)) {
+#if APACHE
+ void (*handler) (int);
+ handler = signal(SIGCHLD, SIG_DFL);
+#endif
OCI(error) =
OCIServerDetach(server->pServer,
OCI(pError),
OCI_DEFAULT);
+
+#if APACHE
+ signal(SIGCHLD,handler);
+#endif
if (OCI(error)) {
oci_error(OCI(pError), "oci_close_server OCIServerDetach", OCI(error));