Attachment 33498 Details for Bug 58926 – 0002: apxs: remove Apache 1.3 code

[patch] 0002: apxs: remove Apache 1.3 code

0002-apxs-remove-Apache-1.3-code.patch (text/plain), 1.80 KB, created by Jacob Champion on 2016-01-28 00:04:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacob Champion

Created: 2016-01-28 00:04:56 UTC

Size: 1.80 KB

patch

obsolete

>From 9c95afe8c5a5a9d4546bd5878c4e75ed44f0570d Mon Sep 17 00:00:00 2001
>From: Jacob Champion <champion.p@gmail.com>
>Date: Wed, 27 Jan 2016 12:03:57 -0800
>Subject: [PATCH 2/4] apxs: remove Apache 1.3 code
>
>The $filename variable is orphaned code -- it was used for the AddModule
>directive, which is no longer supported. Remove it.
>---
> support/apxs.in | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
>diff --git a/support/apxs.in b/support/apxs.in
>index 08fd7cd..0b8966b 100644
>--- a/support/apxs.in
>+++ b/support/apxs.in
>@@ -506,8 +506,7 @@ if ($opt_i or $opt_e) {
> 	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
>         }
> 
>-        #   determine module symbolname and filename
>-        my $filename = '';
>+        #   determine module symbolname
>         if ($name eq 'unknown') {
>             $name = '';
>             my $base = $f;
>@@ -518,15 +517,11 @@ if ($opt_i or $opt_e) {
>                 close(FP);
>                 if ($content =~ m|.*AP_DECLARE_MODULE\s*$\s*([a-zA-Z0-9_]+)\s*$\s*=.*|s || $content =~ m|.*module\s+(?:AP_MODULE_DECLARE_DATA\s+)?([a-zA-Z0-9_]+)_module\s*=\s*.*|s) {
>                     $name = "$1";
>-                    $filename = "$base.c";
>-                    $filename =~ s|^[^/]+/||;
>                 }
>             }
>             if ($name eq '') {
>                 if ($base =~ m|.*mod_([a-zA-Z0-9_]+)|) {
>                     $name = "$1";
>-                    $filename = $base;
>-                    $filename =~ s|^[^/]+/||;
>                 }
>             }
>             if ($name eq '') {
>@@ -535,9 +530,6 @@ if ($opt_i or $opt_e) {
>                 exit(1);
>             }
>         }
>-        if ($filename eq '') {
>-            $filename = "mod_${name}.c";
>-        }
>         my $dir = $CFG_LIBEXECDIR;
>         $dir =~ s|^$CFG_PREFIX/?||;
>         $dir =~ s|(.)$|$1/|;
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 58926: 33497 | 33498 | 33499 | 33500