diff options
author | Dan Kalowsky <kalowsky@php.net> | 2002-08-13 04:10:31 +0000 |
---|---|---|
committer | Dan Kalowsky <kalowsky@php.net> | 2002-08-13 04:10:31 +0000 |
commit | f9e8a5701b0bd28d401eae45de177fe07acbc754 (patch) | |
tree | ad84dbfa5bfe2cd738e671b3e3ef3bec1af6f987 /ext/db | |
parent | cd9bb8e555746f2cbdc382b53612424daa8b015a (diff) | |
download | php-git-f9e8a5701b0bd28d401eae45de177fe07acbc754.tar.gz |
Fix for Bug #18746 by sfox and I
#What is the GDBM_FIX for anyways, we can find it anywhere?
Diffstat (limited to 'ext/db')
-rw-r--r-- | ext/db/db.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/db/db.c b/ext/db/db.c index fc9ec2d23c..e181c7da7d 100644 --- a/ext/db/db.c +++ b/ext/db/db.c @@ -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 @@ char *php_dbm_fetch(dbm_info *info, char *key TSRMLS_DC) 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 |