cvs commit: modperl/Apache Apache.pm

[dougm]

dougm       00/09/28 09:19:59

  Modified:    .        Changes
               src/modules/perl Apache.xs
               Apache   Apache.pm
  Log:
  fix bug where Apache::send_http_header was resetting r->status = 200
  
  Revision  Changes    Path
  1.533     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.532
  retrieving revision 1.533
  diff -u -r1.532 -r1.533
  --- Changes   2000/09/28 15:18:58     1.532
  +++ Changes   2000/09/28 16:19:52     1.533
  @@ -10,6 +10,9 @@
   
   =item 1.24_01-dev
   
  +fix bug where Apache::send_http_header was resetting r->status = 200
  +thanks to brian d foy for the spot
  +
   make extra sure Apache::Constants::AUTOLOAD does not recurse looking
   for sub __AUTOLOAD [Jim Winstead <[EMAIL PROTECTED]>]
   
  
  
  
  1.112     +0 -1      modperl/src/modules/perl/Apache.xs
  
  Index: Apache.xs
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/Apache.xs,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- Apache.xs 2000/09/27 23:51:33     1.111
  +++ Apache.xs 2000/09/28 16:19:56     1.112
  @@ -929,7 +929,6 @@
           r->content_type = pstrdup(r->pool, type);
       send_http_header(r);
       mod_perl_sent_header(r, 1);
  -    r->status = 200; /* XXX, why??? */
   
   #ifndef PERL_OBJECT
   
  
  
  
  1.54      +2 -1      modperl/Apache/Apache.pm
  
  Index: Apache.pm
  ===================================================================
  RCS file: /home/cvs/modperl/Apache/Apache.pm,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Apache.pm 2000/08/31 05:49:05     1.53
  +++ Apache.pm 2000/09/28 16:19:56     1.54
  @@ -180,7 +180,8 @@
            else {
                $not_sent = 1;
            }
  -         $r->send_http_header if $not_sent;
  +         $r->send_http_header if
  +              $not_sent and $r->status == 200;
            $r->print($headers); #send rest of buffer, without stripping newlines!!!
            last;
        }