Finalize the closing process of persistent streams. The current

behavior/API is as follows:

1) To close a persistent use php_stream_pclose(), it will close the stream
and remove it from the persistent list.

2) Inside PHP code only explicit fclose() will close persistent streams,
all other actions such as unset() or assigning a value to stream handle
will not.

3) Regular streams can still be closed by either fclose(), unset() or an
assignment of a value to the stream handler.

1 files changed, 10 insertions, 2 deletions

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index d58a92dd85..ed74bbbb7e 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -321,10 +321,18 @@ static void dba_close(dba_info *info TSRMLS_DC)
 		pefree(info->path, info->flags&DBA_PERSISTENT);
 	}
 	if (info->fp && info->fp!=info->lock.fp) {
-		php_stream_close(info->fp);
+		if(info->flags&DBA_PERSISTENT) {
+			php_stream_pclose(info->fp);
+		} else {
+			php_stream_close(info->fp);
+		}
 	}
 	if (info->lock.fp) {
-		php_stream_close(info->lock.fp);
+		if(info->flags&DBA_PERSISTENT) {
+			php_stream_pclose(info->lock.fp);
+		} else {
+			php_stream_close(info->lock.fp);
+		}
 	}
 	if (info->lock.name) {
 		pefree(info->lock.name, info->flags&DBA_PERSISTENT);