You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2004/04/26 17:45:53 UTC
cvs commit: httpd-2.0/modules/dav/fs lock.c
trawick 2004/04/26 08:45:53
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
modules/dav/fs Tag: APACHE_2_0_BRANCH lock.c
Log:
pick this up from 2.1-dev:
mod_dav: Fix a problem that could cause crashes when manipulating
locks on some platforms.
Reviewed by: jorton, nd
Revision Changes Path
No revision
No revision
1.988.2.271 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.270
retrieving revision 1.988.2.271
diff -u -r1.988.2.270 -r1.988.2.271
--- CHANGES 24 Apr 2004 11:51:06 -0000 1.988.2.270
+++ CHANGES 26 Apr 2004 15:45:51 -0000 1.988.2.271
@@ -1,5 +1,8 @@
Changes with Apache 2.0.50
+ *) mod_dav: Fix a problem that could cause crashes when manipulating
+ locks on some platforms. [Jeff Trawick]
+
*) mod_headers no longer crashes if an empty header value should
be added. [Andr� Malo]
1.751.2.838 +1 -6 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.837
retrieving revision 1.751.2.838
diff -u -r1.751.2.837 -r1.751.2.838
--- STATUS 24 Apr 2004 20:09:30 -0000 1.751.2.837
+++ STATUS 26 Apr 2004 15:45:52 -0000 1.751.2.838
@@ -197,11 +197,6 @@
http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_auth_digest.c?r1=1.86&r2=1.87
+1: geoff, nd
- *) mod_dav: Fix a problem that could cause crashes when manipulating
- locks on some platforms. (especially Sparc!!!)
- modules/dav/fs/lock.c: r1.31
- +1: trawick, jorton, nd
-
*) mod_dav: Fix a 2617 compliance issue
http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/util.c?r1=1.53&r2=1.54
+1: jorton, nd
No revision
No revision
1.25.2.5 +1 -1 httpd-2.0/modules/dav/fs/lock.c
Index: lock.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/fs/lock.c,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -u -r1.25.2.4 -r1.25.2.5
--- lock.c 9 Feb 2004 20:53:15 -0000 1.25.2.4
+++ lock.c 26 Apr 2004 15:45:52 -0000 1.25.2.5
@@ -652,7 +652,7 @@
offset += sizeof(*ip->locktoken);
memcpy(&ip->timeout, val.dptr + offset, sizeof(ip->timeout));
offset += sizeof(ip->timeout);
- ip->key.dsize = *((int *) (val.dptr + offset)); /* length of datum */
+ memcpy(&ip->key.dsize, val.dptr + offset, sizeof(ip->key.dsize)); /* length of datum */
offset += sizeof(ip->key.dsize);
ip->key.dptr = apr_palloc(p, ip->key.dsize);
memcpy(ip->key.dptr, val.dptr + offset, ip->key.dsize);