From: mkanat%bugzilla.org <>
Date: Wed, 19 Dec 2007 06:41:58 +0000 (+0000)
Subject: Bug 408766: Apache::DBI was unnecessary and was causing problems for some users.
X-Git-Tag: bugzilla-3.1.3~424
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b263218145f896e3ec3a214458e2e1985cf2723;p=thirdparty%2Fbugzilla.git

Bug 408766: Apache::DBI was unnecessary and was causing problems for some users.
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=justdave, a=mkanat
---

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index ec241bcca7..40cd3e3a12 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -1065,7 +1065,6 @@ sub db_new {
     }
 
     # connect using our known info to the specified db
-    # Apache::DBI will cache this when using mod_perl
     my $self = DBI->connect($dsn, $user, $pass, $attributes)
         or die "\nCan't connect to the database.\nError: $DBI::errstr\n"
         . "  Is your database installed and up and running?\n  Do you have"
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 05f74e81f5..714bb38714 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -225,12 +225,6 @@ sub OPTIONAL_MODULES {
         version => '3.11',
         feature => 'mod_perl'
     },
-    {
-        package => 'Apache-DBI',
-        module  => 'Apache::DBI',
-        version => '0.96',
-        feature => 'mod_perl'
-    },
     );
 
     my $all_modules = _get_extension_requirements(
diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index 58b7d33aaf..572d16f33a 100644
--- a/docs/xml/installation.xml
+++ b/docs/xml/installation.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: installation.xml,v 1.147 2007/10/19 06:46:18 mkanat%bugzilla.org Exp $ -->
+<!-- $Id: installation.xml,v 1.148 2007/12/19 00:42:00 mkanat%bugzilla.org Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -473,12 +473,6 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            Apache::DBI
-            (&min-apache-dbi-ver;) for mod_perl2
-          </para>
-        </listitem>
       </orderedlist>
       </para>
 
@@ -655,9 +649,6 @@
       <para>Bugzilla also requires a more up-to-date version of the CGI
       perl module to be installed, version &min-mp-cgi-ver; as opposed to &min-cgi-ver;
       </para>
-      
-      <para>Finally, Bugzilla also requires <literal>Apache::DBI</literal>
-      (&min-apache-dbi-ver;) to be installed as well.</para>
     </section>
   </section>
   
diff --git a/mod_perl.pl b/mod_perl.pl
index bc22a774f0..b4a8f297ea 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -28,7 +28,6 @@ use strict;
 # startup, so we always specify () after using any module in this
 # file.
 
-use Apache::DBI ();
 use Apache2::ServerUtil;
 use Apache2::SizeLimit;
 use ModPerl::RegistryLoader ();