cvs: php4 /ext/db db.c
| From: | Dan Kalowsky | Date: | Tue, 13 Aug 2002 04:10:31 +0000 |
| Subject: | cvs: php4 /ext/db db.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13289@lists.php.net to get a copy of this message | ||
kalowsky Tue Aug 13 00:10:31 2002 EDT
Modified files:
/php4/ext/db db.c
Log:
Fix for Bug #18746 by sfox and I
#What is the GDBM_FIX for anyways, we can find it anywhere?
Index: php4/ext/db/db.c
diff -u php4/ext/db/db.c:1.73 php4/ext/db/db.c:1.74
--- php4/ext/db/db.c:1.73 Fri Jun 28 20:40:34 2002
+++ php4/ext/db/db.c Tue Aug 13 00:10:31 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: db.c,v 1.73 2002/06/29 00:40:34 sniper Exp $ */
+/* $Id: db.c,v 1.74 2002/08/13 04:10:31 kalowsky Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -38,15 +38,11 @@
#include <unistd.h>
#endif
-#ifdef PHP_31
-#include "os/nt/flock.h"
-#else
#ifdef PHP_WIN32
#include "win32/flock.h"
#else
#include <sys/file.h>
#endif
-#endif
#if HAVE_FCNTL_H
#include <fcntl.h>
@@ -630,7 +626,12 @@
DBM_TYPE dbf;
key_datum.dptr = key;
+#ifdef PHP_WIN32
+ key_datum.dsize = strlen(key+1);
+#else
key_datum.dsize = strlen(key);
+#endif
+
#if GDBM_FIX
key_datum.dsize++;
#endif