[apache2] 01/02: a2dismod: Do not translate cgi into cgid

[Jean-Michel Vourgère]

This is an automated email from the git hooks/post-receive script.

nirgal pushed a commit to branch master
in repository apache2.

commit 9f777075fe7bf133845ade7025f4b5bc394b3c1b
Author: Jean-Michel Vourgère <nirgal at debian.org>
Date:   Mon Jun 8 02:19:45 2015 +0200

    a2dismod: Do not translate cgi into cgid
    
    When both module are enabled, it was impossible to disable cgi.
---
 debian/a2enmod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/a2enmod b/debian/a2enmod
index 23e3375..ac4bfbd 100755
--- a/debian/a2enmod
+++ b/debian/a2enmod
@@ -131,7 +131,7 @@ sub doit {
 
     my ( $conftgt, $conflink );
     if ( $obj eq 'module' ) {
-        if ( $acton eq 'cgi' && threaded() ) {
+        if ( $act eq 'enable' && $acton eq 'cgi' && threaded() ) {
             print
                 "Your MPM seems to be threaded. Selecting cgid instead of cgi.\n";
             $acton = 'cgid';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git