← Back to branch summary

~ubuntu-branches/ubuntu/feisty/apache2/feisty

« back to all changes in this revision

Viewing changes to debian/patches/033_dbm_read_hash_or_btree

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Barth
  • Date: 2006-12-09 21:05:45 UTC
  • mfrom: (0.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20061209210545-h70s0xaqc2v8vqr2
Tags: 2.2.3-3.2
http://bugs.debian.org/396265
* Non-maintainer upload.
* 043_ajp_connection_reuse: Patch from upstream Bugzilla, fixing a critical
  issue with regard to connection reuse in mod_proxy_ajp.
  Closes: #396265

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/033_dbm_read_hash_or_btree
1
 
--- build-tree/apache2/srclib/apr-util/dbm/apr_dbm_berkeleydb.c 2004-02-13 02:52:42.000000000 -0700
2
 
+++ build-tree/apache2/srclib/apr-util/dbm/apr_dbm_berkeleydb.c 2004-09-28 00:21:37.000000000 -0600
3
 
@@ -172,6 +172,21 @@
4
 
                                            apr_posix_perms2mode(perm))) != 0) {
5
 
                 /* close the DB handler */
6
 
                 (void) (*file.bdb->close)(file.bdb, 0);
7
 
+                if (dberr == EINVAL) {
8
 
+                   if ((dberr = db_create(&file.bdb, NULL, 0)) == 0) {
9
 
+                       if ((dberr = (*file.bdb->open)(file.bdb,
10
 
+#if DB_VER == 4
11
 
+                                               NULL,
12
 
+#endif
13
 
+                                               pathname, NULL,
14
 
+                                               DB_BTREE, dbmode,
15
 
+                                               apr_posix_perms2mode(perm))) != 0) {
16
 
+
17
 
+                            /* close the DB handler */
18
 
+                            (void) (*file.bdb->close)(file.bdb, 0);
19
 
+                       }
20
 
+                   }
21
 
+                }
22
 
             }
23
 
         }
24
 
         file.curs = NULL;
25
 
--- build-tree/apache2/support/dbmmanage.in     2004-09-28 00:28:58.000000000 -0600
26
 
+++ build-tree/apache2/support/dbmmanage.in     2004-09-28 00:29:33.000000000 -0600
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 033_dbm_read_hash_or_btree by Adam Conrad <adconrad@0c3.net>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Be more liberal in the sorts of DBM files we accept.
 
6
 
 
7
@DPATCH@
 
8
--- apache2/support/dbmmanage.in        2004-09-28 00:28:58.000000000 -0600
 
9
+++ apache2/support/dbmmanage.in        2004-09-28 00:29:33.000000000 -0600
27
10
@@ -24,7 +24,7 @@
28
11
 BEGIN { @AnyDBM_File::ISA = qw(DB_File NDBM_File GDBM_File SDBM_File) }
29
12
 use strict;