randyk      2004/07/06 08:49:13

  Modified:    t/protocol pseudo_http.t
               t/protocol/TestProtocol pseudo_http.pm
  Log:
  Reviewed by:  stas
  add demand of @AUTH_MODULE@ to the protocol/pseudo_http test, and
  use @AUTH_MODULE@ and @ACCESS_MODULE@ in the <IfModule ></IfModule>
  directives, to support both 2.0 and 2.1.
  
  Revision  Changes    Path
  1.2       +1 -1      modperl-2.0/t/protocol/pseudo_http.t
  
  Index: pseudo_http.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/protocol/pseudo_http.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pseudo_http.t     5 Jul 2004 01:36:47 -0000       1.1
  +++ pseudo_http.t     6 Jul 2004 15:49:13 -0000       1.2
  @@ -18,7 +18,7 @@
   my $passgood = "foobar";
   my $passbad  = "foObaR";
   
  -plan tests => 13, have_access;
  +plan tests => 13, have_auth && have_access;
   
   {
       # supply correct credential when prompted for such and ask the
  
  
  
  1.2       +9 -7      modperl-2.0/t/protocol/TestProtocol/pseudo_http.pm
  
  Index: pseudo_http.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/protocol/TestProtocol/pseudo_http.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pseudo_http.pm    5 Jul 2004 01:36:47 -0000       1.1
  +++ pseudo_http.pm    6 Jul 2004 15:49:13 -0000       1.2
  @@ -136,13 +136,15 @@
       PerlProcessConnectionHandler TestProtocol::pseudo_http
   
       <Location TestProtocol::pseudo_http>
  -        <IfModule mod_access.c>
  -            Order Deny,Allow
  -            Allow from @servername@
  -            Require user stas
  -            Satisfy any
  -            # htpasswd -bc basic-auth stas foobar
  -            AuthUserFile @ServerRoot@/htdocs/protocols/basic-auth
  +        <IfModule @ACCESS_MODULE@>
  +            <IfModule @AUTH_MODULE@>
  +                Order Deny,Allow
  +                Allow from @servername@
  +                Require user stas
  +                Satisfy any
  +                # htpasswd -bc basic-auth stas foobar
  +                AuthUserFile @ServerRoot@/htdocs/protocols/basic-auth
  +            </IfModule>
           </IfModule>
       </Location>
   
  
  
  

Reply via email to