cvs commit: modperl/src/modules/perl mod_perl.c

[dougm]

dougm       00/09/27 08:23:29

  Modified:    .        Changes
               src/modules/perl mod_perl.c
  Log:
  disable r->proxyreq checking unless PerlTransHandler is enabled and
  configured
  
  Revision  Changes    Path
  1.526     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.525
  retrieving revision 1.526
  diff -u -r1.525 -r1.526
  --- Changes   2000/09/26 21:19:32     1.525
  +++ Changes   2000/09/27 15:23:18     1.526
  @@ -10,6 +10,9 @@
   
   =item 1.24_01-dev
   
  +disable r->proxyreq checking unless PerlTransHandler is enabled and
  +configured
  +
   fix 'make tar_Apache' [Jesse Erlbaum <[EMAIL PROTECTED]>]
   
   fix for Perl{Module,Require} in .htaccess,
  
  
  
  1.128     +4 -2      modperl/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- mod_perl.c        2000/09/26 18:20:47     1.127
  +++ mod_perl.c        2000/09/27 15:23:24     1.128
  @@ -963,7 +963,7 @@
   static int do_proxy (request_rec *r)
   {
       return 
  -     !(r->parsed_uri.hostname
  +     !(r->parsed_uri.scheme && r->parsed_uri.hostname
          && strEQ(r->parsed_uri.scheme, ap_http_method(r))
          && ap_matches_request_vhost(r, r->parsed_uri.hostname,
                                      r->parsed_uri.port_str ? 
  @@ -976,11 +976,13 @@
   {
       dSTATUS;
       dPSRV(r->server);
  +#ifdef PERL_TRANS
   #if MODULE_MAGIC_NUMBER > 19980270
  -    if(r->parsed_uri.scheme && r->parsed_uri.hostname && do_proxy(r)) {
  +    if (cls->PerlTransHandler && do_proxy(r)) {
        r->proxyreq = 1;
        r->uri = r->unparsed_uri;
       }
  +#endif
   #endif
   #ifdef PERL_INIT
       PERL_CALLBACK("PerlInitHandler", cls->PerlInitHandler);