perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0 Changes
Date Wed, 22 Sep 2004 01:29:31 GMT
stas        2004/09/21 18:29:31

  Modified:    xs/tables/current/Apache ConstantsTable.pm
               t/lib/TestAPRlib finfo.pm
               t/apr    constants.t
               src/modules/perl modperl_common_includes.h
               lib/ModPerl Code.pm
               lib/Apache ParseSource.pm
               .        Changes
  Added:       src/modules/perl modperl_apr_compat.h
  Log:
  change a bunch of the APR:: constants to have a better prefix
  (APR::FILETYPE_* and APR::FILEPROT_). libapr will be changed soon too
  
  Revision  Changes    Path
  1.43      +25 -21    modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm
  
  Index: ConstantsTable.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -u -r1.42 -r1.43
  --- ConstantsTable.pm	13 Aug 2004 00:13:18 -0000	1.42
  +++ ConstantsTable.pm	22 Sep 2004 01:29:29 -0000	1.43
  @@ -2,7 +2,7 @@
   
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   # ! WARNING: generated by Apache::ParseSource/0.02
  -# !          Thu Aug 12 17:10:15 2004
  +# !          Fri Sep 17 21:00:55 2004
   # !          do NOT edit, any changes will be lost !
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   
  @@ -343,26 +343,30 @@
         'APR_FINFO_DIRENT'
       ],
       'filetype' => [
  -      'APR_NOFILE',
  -      'APR_REG',
  -      'APR_DIR',
  -      'APR_CHR',
  -      'APR_BLK',
  -      'APR_PIPE',
  -      'APR_LNK',
  -      'APR_SOCK',
  -      'APR_UNKFILE'
  -    ],
  -    'fileperms' => [
  -      'APR_UREAD',
  -      'APR_UWRITE',
  -      'APR_UEXECUTE',
  -      'APR_GREAD',
  -      'APR_GWRITE',
  -      'APR_GEXECUTE',
  -      'APR_WREAD',
  -      'APR_WWRITE',
  -      'APR_WEXECUTE'
  +      'APR_FILETYPE_NOFILE',
  +      'APR_FILETYPE_REG',
  +      'APR_FILETYPE_DIR',
  +      'APR_FILETYPE_CHR',
  +      'APR_FILETYPE_BLK',
  +      'APR_FILETYPE_PIPE',
  +      'APR_FILETYPE_LNK',
  +      'APR_FILETYPE_SOCK',
  +      'APR_FILETYPE_UNKFILE'
  +    ],
  +    'fileprot' => [
  +      'APR_FILEPROT_USETID',
  +      'APR_FILEPROT_UREAD',
  +      'APR_FILEPROT_UWRITE',
  +      'APR_FILEPROT_UEXECUTE',
  +      'APR_FILEPROT_GSETID',
  +      'APR_FILEPROT_GREAD',
  +      'APR_FILEPROT_GWRITE',
  +      'APR_FILEPROT_GEXECUTE',
  +      'APR_FILEPROT_WSTICKY',
  +      'APR_FILEPROT_WREAD',
  +      'APR_FILEPROT_WWRITE',
  +      'APR_FILEPROT_WEXECUTE',
  +      'APR_FILEPROT_OS_DEFAULT'
       ],
       'filepath' => [
         'APR_FILEPATH_NOTABOVEROOT',
  
  
  
  1.5       +18 -13    modperl-2.0/t/lib/TestAPRlib/finfo.pm
  
  Index: finfo.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/lib/TestAPRlib/finfo.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- finfo.pm	17 Sep 2004 22:36:16 -0000	1.4
  +++ finfo.pm	22 Sep 2004 01:29:30 -0000	1.5
  @@ -7,10 +7,6 @@
   use Apache::TestUtil;
   use Apache::TestTrace;
   use Apache::TestConfig;
  -use constant WIN32 => Apache::TestConfig::WIN32;
  -use constant OSX   => Apache::TestConfig::OSX;
  -
  -use constant APACHE_2_0_49_PLUS => have_min_apache_version('2.0.49');
   
   use File::Spec::Functions qw(catfile);
   use Fcntl qw(:mode);
  @@ -18,8 +14,14 @@
   use APR::Finfo ();
   use APR::Pool ();
   
  -use APR::Const -compile => qw(SUCCESS FINFO_NORM REG
  -                              WREAD WWRITE WEXECUTE);
  +use constant WIN32 => Apache::TestConfig::WIN32;
  +use constant OSX   => Apache::TestConfig::OSX;
  +
  +use constant APACHE_2_0_49_PLUS => have_min_apache_version('2.0.49');
  +
  +use APR::Const -compile => qw(SUCCESS FINFO_NORM FILETYPE_REG
  +                              FILEPROT_WREAD FILEPROT_WWRITE
  +                              FILEPROT_WEXECUTE);
   
   sub num_of_tests {
       return 15;
  @@ -69,6 +71,9 @@
               }
           }
   
  +        # XXX: untested
  +        # ->name
  +
           # XXX: are there any platforms csize is available at all?
           # We don't want to see the skipped message all the time if
           # it's not really used anywhere
  @@ -84,21 +89,21 @@
   
           # match world bits
   
  -        ok t_cmp($finfo->protection & APR::WREAD,
  +        ok t_cmp($finfo->protection & APR::FILEPROT_WREAD,
                    $protection & S_IROTH,
  -                 '$finfo->protection() & APR::WREAD');
  +                 '$finfo->protection() & APR::FILEPROT_WREAD');
   
  -        ok t_cmp($finfo->protection & APR::WWRITE,
  +        ok t_cmp($finfo->protection & APR::FILEPROT_WWRITE,
                    $protection & S_IWOTH,
  -                 '$finfo->protection() & APR::WWRITE');
  +                 '$finfo->protection() & APR::FILEPROT_WWRITE');
   
           if (WIN32) {
               skip "different file semantics", 0;
           }
           else {
  -            ok t_cmp($finfo->protection & APR::WEXECUTE,
  +            ok t_cmp($finfo->protection & APR::FILEPROT_WEXECUTE,
                        $protection & S_IXOTH,
  -                     '$finfo->protection() & APR::WEXECUTE');
  +                     '$finfo->protection() & APR::FILEPROT_WEXECUTE');
           }
       }
   
  @@ -115,7 +120,7 @@
           }
   
           ok t_cmp($finfo->filetype,
  -                 APR::REG,
  +                 APR::FILETYPE_REG,
                    '$finfo->filetype()');
       }
   }
  
  
  
  1.5       +1 -1      modperl-2.0/t/apr/constants.t
  
  Index: constants.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/apr/constants.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- constants.t	8 Jul 2004 06:06:33 -0000	1.4
  +++ constants.t	22 Sep 2004 01:29:30 -0000	1.5
  @@ -16,4 +16,4 @@
   ok t_cmp (APR::SUCCESS, 0, 'APR::SUCCESS');
   ok t_cmp (APR::POLLIN, 0x001, 'APR::POLLIN');
   ok t_cmp (HOOK_LAST, 20, 'HOOK_LAST');
  -ok t_cmp (APR::UNKFILE, 127, 'APR::UNKFILE');
  +ok t_cmp (APR::FILETYPE_UNKFILE, 127, 'APR::UNKFILE');
  
  
  
  1.3       +1 -0      modperl-2.0/src/modules/perl/modperl_common_includes.h
  
  Index: modperl_common_includes.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_common_includes.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- modperl_common_includes.h	22 Jun 2004 22:34:10 -0000	1.2
  +++ modperl_common_includes.h	22 Sep 2004 01:29:31 -0000	1.3
  @@ -19,6 +19,7 @@
   /* header files which are independet of Apache/mod_perl */
   
   #include "modperl_apr_includes.h"
  +#include "modperl_apr_compat.h"
   #include "modperl_perl_includes.h"
   #include "modperl_common_types.h"
   
  
  
  
  1.1                  modperl-2.0/src/modules/perl/modperl_apr_compat.h
  
  Index: modperl_apr_compat.h
  ===================================================================
  /* Copyright 2003-2004 The Apache Software Foundation
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *     http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  #ifndef MODPERL_APR_COMPAT_H
  #define MODPERL_APR_COMPAT_H
  
  /* back compat adjustements for older libapr versions */
  
  /* BACK_COMPAT_MARKER: make back compat issues easy to find :) */
  
  /* use the following format:
   *     #if ! AP_MODULE_MAGIC_AT_LEAST(20020903,4)
   *         [compat code]
   *     #endif
   * and don't forget to insert comments explaining exactly
   * which httpd release allows us to remove the compat code
   */
  
  /* apr_filetype_e entries rename */
  
  #ifndef APR_FILETYPE_NOFILE
  #define APR_FILETYPE_NOFILE  APR_NOFILE
  #endif
  #ifndef APR_FILETYPE_REG
  #define APR_FILETYPE_REG     APR_REG
  #endif
  #ifndef APR_FILETYPE_DIR
  #define APR_FILETYPE_DIR     APR_DIR
  #endif
  #ifndef APR_FILETYPE_CHR
  #define APR_FILETYPE_CHR     APR_CHR
  #endif
  #ifndef APR_FILETYPE_BLK
  #define APR_FILETYPE_BLK     APR_BLK
  #endif
  #ifndef APR_FILETYPE_PIPE
  #define APR_FILETYPE_PIPE    APR_PIPE
  #endif
  #ifndef APR_FILETYPE_LNK
  #define APR_FILETYPE_LNK     APR_LNK
  #endif
  #ifndef APR_FILETYPE_SOCK
  #define APR_FILETYPE_SOCK    APR_SOCK
  #endif
  #ifndef APR_FILETYPE_UNKFILE
  #define APR_FILETYPE_UNKFILE APR_UNKFILE
  #endif
  
  
  /* apr file permissions group rename (has no enum) */
  
  #ifndef APR_FILEPROT_USETID
  #define APR_FILEPROT_USETID     APR_USETID
  #endif
  #ifndef APR_FILEPROT_UREAD
  #define APR_FILEPROT_UREAD      APR_UREAD
  #endif
  #ifndef APR_FILEPROT_UWRITE
  #define APR_FILEPROT_UWRITE     APR_UWRITE
  #endif
  #ifndef APR_FILEPROT_UEXECUTE
  #define APR_FILEPROT_UEXECUTE   APR_UEXECUTE
  #endif
  #ifndef APR_FILEPROT_GSETID
  #define APR_FILEPROT_GSETID     APR_GSETID
  #endif
  #ifndef APR_FILEPROT_GREAD
  #define APR_FILEPROT_GREAD      APR_GREAD
  #endif
  #ifndef APR_FILEPROT_GWRITE
  #define APR_FILEPROT_GWRITE     APR_GWRITE
  #endif
  #ifndef APR_FILEPROT_GEXECUTE
  #define APR_FILEPROT_GEXECUTE   APR_GEXECUTE
  #endif
  #ifndef APR_FILEPROT_WSTICKY
  #define APR_FILEPROT_WSTICKY    APR_WSTICKY
  #endif
  #ifndef APR_FILEPROT_WREAD
  #define APR_FILEPROT_WREAD      APR_WREAD
  #endif
  #ifndef APR_FILEPROT_WWRITE
  #define APR_FILEPROT_WWRITE     APR_WWRITE
  #endif
  #ifndef APR_FILEPROT_WEXECUTE
  #define APR_FILEPROT_WEXECUTE   APR_WEXECUTE
  #endif
  #ifndef APR_FILEPROT_OS_DEFAULT
  #define APR_FILEPROT_OS_DEFAULT APR_OS_DEFAULT
  #endif
  /* APR_FILEPROT_FILE_SOURCE_PERMS seems to have only an internal apr
   * use */
  
  
  
  
  #endif /* MODPERL_APR_COMPAT_H */
  
  
  
  1.127     +1 -1      modperl-2.0/lib/ModPerl/Code.pm
  
  Index: Code.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -u -r1.126 -r1.127
  --- Code.pm	21 Sep 2004 21:35:30 -0000	1.126
  +++ Code.pm	22 Sep 2004 01:29:31 -0000	1.127
  @@ -656,7 +656,7 @@
                                           largefiles);
   my @h_names = (@c_names, map { "modperl_$_" } @h_src_names,
                  qw(types time apache_includes perl_includes apr_includes
  -                  common_includes common_types));
  +                  apr_compat common_includes common_types));
   sub h_files { [map { "$_.h" } @h_names, @g_h_names] }
   
   sub clean_files {
  
  
  
  1.60      +3 -2      modperl-2.0/lib/Apache/ParseSource.pm
  
  Index: ParseSource.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/ParseSource.pm,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -u -r1.59 -r1.60
  --- ParseSource.pm	13 Aug 2004 00:13:17 -0000	1.59
  +++ ParseSource.pm	22 Sep 2004 01:29:31 -0000	1.60
  @@ -250,7 +250,8 @@
           error     => [qw{APR_E}],
           filemode  => ["APR_($filemode)"],
           filepath  => [qw{APR_FILEPATH_}],
  -        fileperms => [qw{APR_\w(READ|WRITE|EXECUTE)}],
  +        fileprot  => [qw{APR_FILEPROT_}],
  +        filetype  => [qw{APR_FILETYPE_}],
           finfo     => [qw{APR_FINFO_}],
           flock     => [qw{APR_FLOCK_}],
           hook      => [qw{APR_HOOK_}],
  @@ -276,7 +277,7 @@
   
   my %enums_wanted = (
       Apache => { map { $_, 1 } qw(cmd_how input_mode filter_type conn_keepalive) },
  -    APR => { map { $_, 1 } qw(apr_shutdown_how apr_read_type apr_lockmech apr_filetype)
},
  +    APR => { map { $_, 1 } qw(apr_shutdown_how apr_read_type apr_lockmech) },
   );
   
   my $defines_unwanted = join '|', qw{
  
  
  
  1.495     +4 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.494
  retrieving revision 1.495
  diff -u -u -r1.494 -r1.495
  --- Changes	21 Sep 2004 21:35:29 -0000	1.494
  +++ Changes	22 Sep 2004 01:29:31 -0000	1.495
  @@ -12,6 +12,10 @@
   
   =item 1.99_17-dev
   
  +change a bunch of the APR:: constants to have a better prefix
  +(APR::FILETYPE_* and APR::FILEPROT_). libapr will be changed soon too
  +[Stas]
  +
   Generate modperl_exports.c for static builds to prevent the
   linker from stripping needed but unused symbols [Gozer]
   
  
  
  

Mime
View raw message