httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/server log.c
Date Tue, 01 Jun 2004 15:30:17 GMT
jorton      2004/06/01 08:30:17

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS CHANGES
               modules/loggers Tag: APACHE_2_0_BRANCH mod_log_config.c
               server   Tag: APACHE_2_0_BRANCH log.c
  Log:
  * modules/loggers/mod_log_config.c, server/log.c (open_error_log,
  ap_replace_stderr_log): Use APR_LARGEFILE when opening log files, to
  allow log files to exceed the 2Gb limit if necessary.
  
  PR: 13511
  Reviewed by: Jeff Trawick, André Malo
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.893 +1 -14     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.892
  retrieving revision 1.751.2.893
  diff -d -u -r1.751.2.892 -r1.751.2.893
  --- STATUS	31 May 2004 09:47:50 -0000	1.751.2.892
  +++ STATUS	1 Jun 2004 15:30:15 -0000	1.751.2.893
  @@ -95,19 +95,6 @@
          instead of db3. Fixed complaints about unpackaged files.
          build/rpm/httpd.spec.in: r1.5
          +1: minfrin, nd
  - 
  -    *) Use APR_LARGEFILE when opening log files, and not APR_WRITE,
  -       allowing >2Gb log files on some platforms with a 32-bit off_t
  -       http://www.apache.org/~jorton/largelog.diff
  -       
  -       which is:
  -       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/log.c?r1=1.143&r2=1.144
  -       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/log.c?r1=1.134&r2=1.135
  -       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/loggers/mod_log_config.c?r1=1.116&r2=1.117
  -       with conditional use of APR_LARGEFILE
  -
  -       PR: 13511
  -       +1: jorton, trawick, nd
   
       *) mod_ssl: Fix potential SEGV in 'shmcb' session cache.
          modules/ssl/ssl_scache_shmcb.c: r1.26
  
  
  
  1.988.2.290 +7 -4      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.289
  retrieving revision 1.988.2.290
  diff -d -u -r1.988.2.289 -r1.988.2.290
  --- CHANGES	26 May 2004 23:30:37 -0000	1.988.2.289
  +++ CHANGES	1 Jun 2004 15:30:15 -0000	1.988.2.290
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) Remove 2Gb log file size restriction on some 32-bit platforms.
  +     PR 13511.  [Joe Orton]
  +
     *) mod_logio no longer removes the EOS bucket. PR 27928.
        [Bojan Smojver <bojan rexursive.com>]
   
  @@ -21,24 +24,24 @@
   
     *) Fix a segfault when requests for shared memory fails and returns
        NULL. Fix a segfault caused by a lack of bounds checking on the
  -     cache. PR 24801 [Graham Leggett]
  +     cache.  PR 24801.  [Graham Leggett]
   
     *) Throw an error message if an attempt is made to use the LDAPTrustedCA
        or LDAPTrustedCAType directives in a VirtualHost. PR 26390
        [Brad Nicholes]
   
     *) Fix a potential segfault if the bind password in the LDAP cache
  -     is NULL. PR 28250 [Jari Ahonen <jah@progress.com>]
  +     is NULL.  PR 28250.  [Jari Ahonen <jah progress.com>]
   
     *) Quotes cannot be used around require group and require dn
        directives, update the documentation to reflect this. Also add
        quotes around the dn and group within debug messages, to make it
        more obvious why authentication is failing if quotes are used in
  -     error. PR 19304 [Graham Leggett]
  +     error.  PR 19304.  [Graham Leggett]
   
     *) The Microsoft LDAP SDK escapes filters for us, stop util_ldap
        from escaping filters twice when the backslash character is used.
  -     PR 24437 [Jess Holle <jessh@ptc.com>]
  +     PR 24437.  [Jess Holle <jessh ptc.com>]
   
     *) Overhaul handling of LDAP error conditions, so that the util_ldap_*
        functions leave the connections in a sane state after errors have
  
  
  
  No                   revision
  No                   revision
  1.95.2.13 +4 -1      httpd-2.0/modules/loggers/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v
  retrieving revision 1.95.2.12
  retrieving revision 1.95.2.13
  diff -d -u -r1.95.2.12 -r1.95.2.13
  --- mod_log_config.c	3 Mar 2004 11:07:50 -0000	1.95.2.12
  +++ mod_log_config.c	1 Jun 2004 15:30:16 -0000	1.95.2.13
  @@ -170,8 +170,11 @@
   
   module AP_MODULE_DECLARE_DATA log_config_module;
   
  +#ifndef APR_LARGEFILE
  +#define APR_LARGEFILE 0
  +#endif
   
  -static int xfer_flags = (APR_WRITE | APR_APPEND | APR_CREATE);
  +static int xfer_flags = (APR_WRITE | APR_APPEND | APR_CREATE | APR_LARGEFILE);
   static apr_fileperms_t xfer_perms = APR_OS_DEFAULT;
   static apr_hash_t *log_hash;
   static apr_status_t ap_default_log_writer(request_rec *r,
  
  
  
  No                   revision
  No                   revision
  1.127.2.11 +6 -2      httpd-2.0/server/log.c
  
  Index: log.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/log.c,v
  retrieving revision 1.127.2.10
  retrieving revision 1.127.2.11
  diff -d -u -r1.127.2.10 -r1.127.2.11
  --- log.c	8 Mar 2004 23:12:44 -0000	1.127.2.10
  +++ log.c	1 Jun 2004 15:30:16 -0000	1.127.2.11
  @@ -50,6 +50,10 @@
   #include "util_time.h"
   #include "ap_mpm.h"
   
  +#ifndef APR_LARGEFILE
  +#define APR_LARGEFILE 0
  +#endif
  +
   typedef struct {
       char    *t_name;
       int      t_val;
  @@ -158,7 +162,7 @@
           return APR_EBADPATH;
       }
       if ((rc = apr_file_open(&stderr_file, filename,
  -                            APR_APPEND | APR_READ | APR_WRITE | APR_CREATE,
  +                            APR_APPEND | APR_WRITE | APR_CREATE | APR_LARGEFILE,
                               APR_OS_DEFAULT, p)) != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL,
                        "%s: could not open error log file %s.",
  @@ -271,7 +275,7 @@
               return DONE;
           }
           if ((rc = apr_file_open(&s->error_log, fname,
  -                               APR_APPEND | APR_READ | APR_WRITE | APR_CREATE,
  +                               APR_APPEND | APR_WRITE | APR_CREATE | APR_LARGEFILE,
                                  APR_OS_DEFAULT, p)) != APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL,
                            "%s: could not open error log file %s.",
  
  
  

Mime
View raw message