perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From go...@apache.org
Subject cvs commit: modperl-2.0/xs/maps modperl_functions.map
Date Fri, 24 Sep 2004 19:55:35 GMT
gozer       2004/09/24 12:55:35

  Modified:    .        Changes
               lib/Apache compat.pm
               src/modules/perl modperl_log.h
               t/response/TestAPI aplog.pm
               todo     release
               xs/maps  modperl_functions.map
  Log:
  $r->log_reason has been ported and moved out of Apache::compat
  
  Revision  Changes    Path
  1.497     +3 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.496
  retrieving revision 1.497
  diff -u -r1.496 -r1.497
  --- Changes	22 Sep 2004 23:22:06 -0000	1.496
  +++ Changes	24 Sep 2004 19:55:35 -0000	1.497
  @@ -12,6 +12,9 @@
   
   =item 1.99_17-dev
   
  +$r->log_reason has been ported and moved out of Apache::compat
  +[Gozer]
  +
   APR::OS::thread_current renamed APR::OS::current_thread_id and
   now returns the actual thread_id instead of an object that
   needed to be dereferenced to get at the thread_id [Gozer]
  
  
  
  1.123     +0 -2      modperl-2.0/lib/Apache/compat.pm
  
  Index: compat.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- compat.pm	16 Sep 2004 16:36:28 -0000	1.122
  +++ compat.pm	24 Sep 2004 19:55:35 -0000	1.123
  @@ -597,8 +597,6 @@
       #XXX resolve '.' in @INC to basename $r->filename
   }
   
  -*log_reason = \&log_error;
  -
   #XXX: would like to have a proper implementation
   #that reads line-by-line as defined by $/
   #the best way will probably be to use perlio in 5.8.0
  
  
  
  1.15      +2 -2      modperl-2.0/src/modules/perl/modperl_log.h
  
  Index: modperl_log.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_log.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- modperl_log.h	16 Jun 2004 03:55:47 -0000	1.14
  +++ modperl_log.h	24 Sep 2004 19:55:35 -0000	1.15
  @@ -38,8 +38,8 @@
       ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, \
                    "access to %s failed for %s, reason: %s", \
                    file, \
  -                 get_remote_host(r->connection, \
  -                 r->per_dir_config, REMOTE_NAME), \
  +                 ap_get_remote_host(r->connection, \
  +                 r->per_dir_config, REMOTE_NAME, NULL), \
                    msg)
   
   #endif /* MODPERL_LOG_H */
  
  
  
  1.21      +16 -1     modperl-2.0/t/response/TestAPI/aplog.pm
  
  Index: aplog.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/aplog.pm,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- aplog.pm	17 Sep 2004 00:07:43 -0000	1.20
  +++ aplog.pm	24 Sep 2004 19:55:35 -0000	1.21
  @@ -28,7 +28,7 @@
       my $r = shift;
       my $s = $r->server;
   
  -    plan $r, tests => (@LogLevels * 2) + 17;
  +    plan $r, tests => (@LogLevels * 2) + 19;
   
       my $logdiff = TestCommon::LogDiff->new($path);
   
  @@ -104,6 +104,21 @@
           ok t_cmp $logdiff->diff,
               qr/\[error\] \$s->log_error test/,
               '$s->log_error(...)';
  +    }
  +    
  +    # log_reason
  +    {
  +        t_server_log_error_is_expected();
  +        $r->log_reason('$r->log_reason test');
  +        ok t_cmp $logdiff->diff,
  +            qr/\[error\] access to.*failed.*reason: \$r->log_reason test/,
  +            '$r->log_reason(msg)';
  +        
  +        t_server_log_error_is_expected();
  +        $r->log_reason('$r->log_reason filename test','filename');
  +        ok t_cmp $logdiff->diff,
  +            qr/\[error\] access to filename failed.*\$r->log_reason filename test/,
  +            '$r->log_reason(msg, filename)';
       }
   
       # XXX: at the moment we can't change loglevel after server startup
  
  
  
  1.64      +0 -4      modperl-2.0/todo/release
  
  Index: release
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/todo/release,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- release	22 Sep 2004 23:22:06 -0000	1.63
  +++ release	24 Sep 2004 19:55:35 -0000	1.64
  @@ -4,10 +4,6 @@
   
   -- see also todo/api_status
   
  -* $r->log_reason:
  -  just add to compat
  -  owner: stas
  -
   * APR::Finfo constants: APR::FILETYPE_* and APR::FILEPROT_* will
     probably be APR::FTYPE_* and APR::FPROT_*
     will know exactly once libapr is fixed
  
  
  
  1.89      +1 -0      modperl-2.0/xs/maps/modperl_functions.map
  
  Index: modperl_functions.map
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- modperl_functions.map	16 Sep 2004 16:36:29 -0000	1.88
  +++ modperl_functions.map	24 Sep 2004 19:55:35 -0000	1.89
  @@ -124,6 +124,7 @@
   DEFINE_log_rerror | MPXS_Apache__Log_log_xerror | ...
   DEFINE_log_error  | MPXS_Apache__Log_log_error  | ...
   DEFINE_warn       | MPXS_Apache__Log_log_error  | ...
  +DEFINE_log_reason | modperl_log_reason | request_rec *:r, char *:msg, char *:file=r->uri
   
   PACKAGE=Apache::ServerRec
   SV *:DEFINE_log   | | SV *:obj
  
  
  

Mime
View raw message