mod_perl-1.24 / apache-1.3.14 problem

[Mike Hanafey]

The httpd.h file in apache-1.3.14 has apparently changed. I hacked the
following changes to mod_perl-1.24 to fix things (it's the same change
in two files). Without the change Makefile.PL was picking up the wrong
apache source (even though I have it the source explicitly), and the 
"src.t" test fails on make test.

>>>% diff -c ./Makefile.PL.orig ./Makefile.PL >| /tmp/tmp
*** ./Makefile.PL.orig  Sun May 14 20:07:58 2000
--- ./Makefile.PL       Wed Jan  3 15:03:16 2001
***************
*** 1494,1504 ****
      my($server, $version, $rest);
      my($fserver, $fversion, $frest);
      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/;
!       chomp($string = $_);
  
        #print STDERR "Examining SERVER_VERSION '$string'...";
        #could be something like:
--- 1494,1512 ----
      my($server, $version, $rest);
      my($fserver, $fversion, $frest);
      my($string, $extra, @vers);
+     my($sbp, $sbv);
      while(<$fh>) {
        next unless /^#define/;
!       m/SERVER_BASEPRODUCT\s+"(.+)"/ and $sbp = $1;
!       m/SERVER_BASEREVISION\s+"(.+)"/ and $sbv = $1;
!       if ($sbp && $sbv) {
!           # Apache 1.3.14
!           $string = "$sbp/$sbv";
!       } else {
!           s/SERVER_PRODUCT \"/\"Apache/; #1.3.13+
!           next unless s/^#define\s+SERVER_(BASE|)VERSION\s+"(.*)\s*".*/$2/;
!           chomp($string = $_);
!       }
  
        #print STDERR "Examining SERVER_VERSION '$string'...";
        #could be something like:

        
>>>% diff -c ./lib/Apache/src.pm.orig ./lib/Apache/src.pm >| /tmp/tmp
*** ./lib/Apache/src.pm.orig    Fri Mar 31 14:05:24 2000
--- ./lib/Apache/src.pm Wed Jan  3 16:10:19 2001
***************
*** 209,220 ****
      my($server, $version, $rest);
      my($fserver, $fversion, $frest);
      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/;
!       chomp($string = $_);
  
        #print STDERR "Examining SERVER_VERSION '$string'...";
        #could be something like:
--- 209,228 ----
      my($server, $version, $rest);
      my($fserver, $fversion, $frest);
      my($string, $extra, @vers);
+     my($sbp, $sbv);
  
      while(<$fh>) {
        next unless /^#define/;
!       m/SERVER_BASEPRODUCT\s+"(.+)"/ and $sbp = $1;
!       m/SERVER_BASEREVISION\s+"(.+)"/ and $sbv = $1;
!       if ($sbp && $sbv) {
!           # Apache 1.3.14
!           $string = "$sbp/$sbv";
!       } else {
!          s/SERVER_PRODUCT \"/\"Apache/; #1.3.13+
!          next unless s/^#define\s+SERVER_(BASE|)VERSION\s+"(.*)\s*".*/$2/;
!          chomp($string = $_);
!       }
  
        #print STDERR "Examining SERVER_VERSION '$string'...";
        #could be something like:

Mike Hanafey ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DuPont Ag Products                                                          |
Delaware Technology Park, Suite 200/206                                     |
1 Innovation Way, PO BOX 6104                                               |
Newark, DE 19714-6104                                                       |
Email: [EMAIL PROTECTED] Phone: (302)631-2608 Fax: (302)631-2607 ++