Upstream tarball 2.2.11upstream/2.2.11

14 files changed, 38 insertions, 38 deletions

diff --git a/support/ab.c b/support/ab.c
index e39536d1..f855bbd3 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -1473,7 +1473,7 @@ static void read_connection(struct connection * c)
                 if (!cl) {
                     c->keepalive = 1;
                     c->length = 0; 
-                }	
+                }
             }
             c->bread += c->cbx - (s + l - c->cbuff) + r - tocopy;
             totalbread += c->bread;
diff --git a/support/ab.dsp b/support/ab.dsp
index 5c67d097..5925691f 100644
--- a/support/ab.dsp
+++ b/support/ab.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\ab.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "ab - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\ab.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/abs.dsp b/support/abs.dsp
index 1e7ed1df..c8ba600e 100644
--- a/support/abs.dsp
+++ b/support/abs.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\abs.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "abs - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\abs.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/htcacheclean.dsp b/support/htcacheclean.dsp
index ccca4b25..d3d4b8fa 100644
--- a/support/htcacheclean.dsp
+++ b/support/htcacheclean.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\htcacheclean.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "htcacheclean - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\htcacheclean.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/htdbm.dsp b/support/htdbm.dsp
index 541e330b..e6864072 100644
--- a/support/htdbm.dsp
+++ b/support/htdbm.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\htdbm.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "htdbm - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\htdbm.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/htdigest.dsp b/support/htdigest.dsp
index 1f235f7d..63c23baf 100644
--- a/support/htdigest.dsp
+++ b/support/htdigest.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\htdigest.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\htdigest.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/htpasswd.dsp b/support/htpasswd.dsp
index 4bd9b536..36a57259 100644
--- a/support/htpasswd.dsp
+++ b/support/htpasswd.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\htpasswd.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\htpasswd.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/httxt2dbm.dsp b/support/httxt2dbm.dsp
index f6b36ae0..cba28a0b 100644
--- a/support/httxt2dbm.dsp
+++ b/support/httxt2dbm.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\httxt2dbm.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "httxt2dbm - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\httxt2dbm.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/list_hooks.pl b/support/list_hooks.pl
index cb863db7..7a6c9332 100755
--- a/support/list_hooks.pl
+++ b/support/list_hooks.pl
@@ -59,16 +59,25 @@ sub findInDir {
 sub scanFile {
     my $file=shift;
 
-#    print "scanning $file\n";
+#   print "scanning $file\n";
 
     open(F,$file) || croak "Can't open $file: $!";
     while(<F>) {
 	next if /\#define/;
 	next if /\@deffunc/;
-	if(/AP_DECLARE_HOOK\((.*)\)/) {
-	    my $def=$1;
-	    my($ret,$name,$args)=$def=~/([^,\s]+)\s*,\s*([^,\s]+)\s*,\s*\((.*)\)/;
-	    croak "Don't understand $def in $file" if !defined $args;
+	if(/AP_DECLARE_HOOK\s*\(/) {
+	    my($ret,$name,$args);
+	    while(!(($ret,$name,$args)=
+		   /AP_DECLARE_HOOK\s*\(\s*([^,]+)\s*,\s*([^,\s]+)\s*,\s*\((.*?)\)\)/s)) {
+		chomp;
+		# swallow subsequent lines if needed to get all the required info
+		my $l=<F>;
+		return unless defined $l;
+		$l=~s/^\s*/ /;
+		$_.=$l;
+	    }
+	    $ret=~s/\s*$//;
+	    $args=~s/^\s*//; $args=~s/\s*$//;
 #	    print "found $ret $name($args) in $file\n";
 
 	    croak "$name declared twice! ($_)"
@@ -76,15 +85,6 @@ sub scanFile {
 	    $::Hooks{$name}->{declared}=$file;
 	    $::Hooks{$name}->{ret}=$ret;
 	    $::Hooks{$name}->{args}=$args;
-	} elsif(/AP_DECLARE_HOOK\((\s*[^,\s]+)\s*,\s*([^,\s]+)/) {
-# really we should swallow subsequent lines to get the arguments...
-	    my $name=$2;
-	    my $ret=$1;
-	    croak "$name declared twice! ($_)"
-		if exists $::Hooks{$name}->{declared};
-	    $::Hooks{$name}->{declared}=$file;
-	    $::Hooks{$name}->{ret}=$ret;
-	    $::Hooks{$name}->{args}='???';
 	}
 	if(/AP_IMPLEMENT_HOOK_()(VOID)\(([^,\s]+)/
 	   || /AP_IMPLEMENT(_OPTIONAL|)_HOOK_(.*?)\([^,]+?\s*,\s*([^,\s]+)/) {
diff --git a/support/logresolve.c b/support/logresolve.c
index fb9d4f56..1a36a18f 100644
--- a/support/logresolve.c
+++ b/support/logresolve.c
@@ -341,7 +341,7 @@ int main (int argc, char *argv[])
         if (line[0] == '\0')
             continue;
         entries++;
-        if (!apr_isdigit(line[0])) {	/* short cut */
+        if (!apr_isdigit(line[0])) {  /* short cut */
             puts(line);
             withname++;
             continue;
diff --git a/support/logresolve.dsp b/support/logresolve.dsp
index ac404dbc..24c946dd 100644
--- a/support/logresolve.dsp
+++ b/support/logresolve.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\logresolve.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "logresolve - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\logresolve.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/rotatelogs.dsp b/support/rotatelogs.dsp
index 5a043208..7fda0e05 100644
--- a/support/rotatelogs.dsp
+++ b/support/rotatelogs.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\rotatelogs.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\rotatelogs.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/win32/ApacheMonitor.dsp b/support/win32/ApacheMonitor.dsp
index 84369aaa..3465ecd7 100644
--- a/support/win32/ApacheMonitor.dsp
+++ b/support/win32/ApacheMonitor.dsp
@@ -58,7 +58,7 @@ LINK32=link.exe
 TargetPath=.\Release\ApacheMonitor.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
@@ -90,7 +90,7 @@ LINK32=link.exe
 TargetPath=.\Debug\ApacheMonitor.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF 
diff --git a/support/win32/wintty.dsp b/support/win32/wintty.dsp
index 8d5b9df6..337ba17a 100644
--- a/support/win32/wintty.dsp
+++ b/support/win32/wintty.dsp
@@ -55,7 +55,7 @@ LINK32=link.exe
 TargetPath=.\Release\wintty.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "wintty - Win32 Debug"
@@ -85,7 +85,7 @@ LINK32=link.exe
 TargetPath=.\Debug\wintty.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1
 # End Special Build Tool
 
 !ENDIF