helly Thu Jan 15 16:28:38 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/dba dba.c
Log:
Add missing fd creation
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.61.2.24 php-src/ext/dba/dba.c:1.61.2.25
--- php-src/ext/dba/dba.c:1.61.2.24 Sun Dec 14 17:20:04 2003
+++ php-src/ext/dba/dba.c Thu Jan 15 16:28:37 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.61.2.24 2003/12/14 22:20:04 helly Exp $ */
+/* $Id: dba.c,v 1.61.2.25 2004/01/15 21:28:37 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -760,7 +760,13 @@
FREENOW;
RETURN_FALSE;
}
- if (php_flock(info->lock.fd, lock_mode)) {
+ if (php_stream_cast(info->lock.fp, PHP_STREAM_AS_FD,
(void*)&info->lock.fd, 1) == FAILURE) {
+ dba_close(info TSRMLS_CC);
+ /* stream operation already wrote an error message */
+ FREENOW;
+ RETURN_FALSE;
+ }
+ if (php_flock(info->lock.fd, lock_mode)) {
error = "Unable to establish lock"; /* force failure exit */
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
