← Back to branch summary

~ubuntu-branches/ubuntu/saucy/apache2/saucy

« back to all changes in this revision

Viewing changes to debian/patches/033_CAN-2004-0809.patch

  • Committer: Bazaar Package Importer
  • Author(s): Thom May
  • Date: 2004-10-13 19:46:10 UTC
  • Revision ID: james.westby@ubuntu.com-20041013194610-ccvqcz8vflh5zqrm
Tags: 2.0.50-12ubuntu4
Security Release. Patch from upstream for the following:
CAN-2004-0885SSLCypherSuite can be bypassed during renegotiation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/033_CAN-2004-0809.patch
 
1
===================================================================
 
2
RCS file: /home/cvspublic/httpd-2.0/modules/dav/fs/lock.c,v
 
3
retrieving revision 1.32
 
4
retrieving revision 1.33
 
5
diff -u -r1.32 -r1.33
 
6
--- httpd-2.0/modules/dav/fs/lock.c     2004/09/12 22:14:57     1.32
 
7
+++ build-tree/apache2/modules/dav/fs/lock.c    2004/09/12 22:24:05     1.33
 
8
@@ -1469,13 +1469,13 @@
 
9
        }
 
10
        if (dav_fs_do_refresh(dp_scan, ltl, new_time)) {
 
11
            /* the lock was refreshed. return the lock. */
 
12
-           newlock = dav_fs_alloc_lock(lockdb, ip->key, dp->locktoken);
 
13
+           newlock = dav_fs_alloc_lock(lockdb, ip->key, dp_scan->locktoken);
 
14
            newlock->is_locknull = !resource->exists;
 
15
-           newlock->scope = dp->f.scope;
 
16
-           newlock->type = dp->f.type;
 
17
-           newlock->depth = dp->f.depth;
 
18
-           newlock->timeout = dp->f.timeout;
 
19
-           newlock->owner = dp->owner;
 
20
+           newlock->scope = dp_scan->f.scope;
 
21
+           newlock->type = dp_scan->f.type;
 
22
+           newlock->depth = dp_scan->f.depth;
 
23
+           newlock->timeout = dp_scan->f.timeout;
 
24
+           newlock->owner = dp_scan->owner;
 
25
             newlock->auth_user = dp_scan->auth_user;
 
26
 
 
27
            newlock->next = *locks;