Commit 65f4616a authored by Joe Orton's avatar Joe Orton
Browse files

* modules/dav/fs/lock.c (dav_size_indirect): Fix indirect lock record 

handling on 64-bit platforms: use correct size of apr_datum_t.dsize
field.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105099 13f79535-47bb-0310-9956-ffa450edef68
parent dcf93508

modules/dav/fs/lock.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
**    INDIRECT LOCK:   [char      (DAV_LOCK_INDIRECT),

**			apr_uuid_t locktoken,

**			time_t     expires,

**			int        key_size,

**			apr_size_t key_size,

**			char[]     key]

**       The key is to the collection lock that resulted in this indirect lock

*/
@@ -157,7 +157,7 @@ typedef struct dav_lock_indirect 
/* Stored indirect lock info - lock token and apr_datum_t */

#define dav_size_indirect(a)	(1 + sizeof(apr_uuid_t) \

				 + sizeof(time_t) \

				 + sizeof(int) + (a)->key.dsize)

				 + sizeof((a)->key.dsize) + (a)->key.dsize)



/*

** The lockdb structure.