dougm 00/06/05 11:16:36
Modified: . Changes Makefile.PL
lib/Apache src.pm
Log:
support version parsing of 1.3.13-dev's httpd.h
Revision Changes Path
1.497 +2 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -r1.496 -r1.497
--- Changes 2000/06/05 15:41:50 1.496
+++ Changes 2000/06/05 18:16:23 1.497
@@ -10,6 +10,8 @@
=item 1.24_01-dev
+support version parsing of 1.3.13-dev's httpd.h
+
fix for 'sub handler : method {}' support when method is not found
[Eric Cholet <[EMAIL PROTECTED]>]
1.164 +5 -2 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- Makefile.PL 2000/05/25 18:06:13 1.163
+++ Makefile.PL 2000/06/05 18:16:25 1.164
@@ -1501,8 +1501,11 @@
my($string, $extra, @vers);
while(<$fh>) {
next unless /^#define/;
- s/SERVER_PRODUCT \"/\"Apache/; #1.3.13+
- next unless s/^#define\s+SERVER_(BASE|)VERSION\s+"(.*)\s*".*/$2/;
+ s/SERVER_PRODUCT \"/\"Apache/; #1.3.13
+ next unless s/^#define\s+SERVER_(BASE|)(VERSION|REVISION)\s+"(.*)\s*".*/$3/;
+ unless (m:/:) {
+ $_ = "Apache/$_"; #1.3.14, argh
+ }
chomp($string = $_);
#print STDERR "Examining SERVER_VERSION '$string'...";
1.26 +5 -2 modperl/lib/Apache/src.pm
Index: src.pm
===================================================================
RCS file: /home/cvs/modperl/lib/Apache/src.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- src.pm 2000/03/26 20:32:53 1.25
+++ src.pm 2000/06/05 18:16:33 1.26
@@ -212,8 +212,11 @@
while(<$fh>) {
next unless /^#define/;
- s/SERVER_PRODUCT \"/\"Apache/; #1.3.13+
- next unless s/^#define\s+SERVER_(BASE|)VERSION\s+"(.*)\s*".*/$2/;
+ s/SERVER_PRODUCT \"/\"Apache/; #1.3.13
+ next unless s/^#define\s+SERVER_(BASE|)(VERSION|REVISION)\s+"(.*)\s*".*/$3/;
+ unless (m:/:) {
+ $_ = "Apache/$_"; #1.3.14, argh
+ }
chomp($string = $_);
#print STDERR "Examining SERVER_VERSION '$string'...";
